From 8fdf54d02badbd38cee6fad2f51aecede3d10895 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sat, 7 Jan 2006 15:34:22 +0000
Subject: [PATCH] fixed up bugs when font colors are not set to black on white

svn: r1781
---
 collects/drscheme/private/font.ss |  6 ++++--
 collects/sirmail/readr.ss         | 10 ++++++++--
 collects/sirmail/sendr.ss         | 11 +++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/collects/drscheme/private/font.ss b/collects/drscheme/private/font.ss
index 4128322831..f529a54694 100644
--- a/collects/drscheme/private/font.ss
+++ b/collects/drscheme/private/font.ss
@@ -140,7 +140,9 @@
                                        [(2) 'smoothed]
                                        [(3) 'default])))))]
                   
-                  [text (make-object (editor:standard-style-list-mixin text%))]
+                  [text (make-object (text:foreground-color-mixin
+                                      (editor:standard-style-list-mixin 
+                                       text:basic%)))]
                   [ex-panel (make-object horizontal-panel% main)]
                   [msg (make-object message% (string-constant example-text) ex-panel)]
                   [canvas (make-object canvas:color% main text)]
@@ -169,7 +171,7 @@
                      (send text set-position 0 0)
                      (send text lock #t)
                      (send text end-edit-sequence))])
-             
+             (send text set-styles-fixed #t)
              (preferences:add-callback
               'framework:standard-style-list:font-size
               (λ (p v) (send size-slider set-value v)))
diff --git a/collects/sirmail/readr.ss b/collects/sirmail/readr.ss
index f37b4dcc68..75d1fe27c9 100644
--- a/collects/sirmail/readr.ss
+++ b/collects/sirmail/readr.ss
@@ -879,7 +879,13 @@
           (send e end-edit-sequence)
           i))
 
-      (define display-text% (html-text-mixin text:standard-style-list%))
+      (define display-text%
+        (class (html-text-mixin
+                (text:foreground-color-mixin
+                 text:standard-style-list%))
+          (super-new)
+          (inherit set-styles-fixed)
+          (set-styles-fixed #t)))
       
       ;; Class for the panel that has columns titles and
       ;; supports clicks to change the sort order
@@ -1746,7 +1752,7 @@
 			     (vertical-inset 1)))
       (define header-list (make-object header-list% top-half))
       (send (send header-list get-editor) set-line-spacing 0)
-      (define message (new editor-canvas% 
+      (define message (new canvas:color% 
 			   [parent sizing-panel]
 			   [style '(auto-hscroll)]))
       (send header-list min-height 20)
diff --git a/collects/sirmail/sendr.ss b/collects/sirmail/sendr.ss
index e4af8cc293..801e455655 100644
--- a/collects/sirmail/sendr.ss
+++ b/collects/sirmail/sendr.ss
@@ -345,13 +345,14 @@
                                           '(ok)))])
                        (delete-file t)))))))
         
-        (define c (new editor-canvas% 
+        (define c (new canvas:color% 
                        [parent (send mailer-frame get-area-container)]
                        [style '(auto-hscroll)]))
         (define message-editor-super%
           (color:text-mixin 
            (editor:backup-autosave-mixin
-            text:standard-style-list%)))
+            (text:foreground-color-mixin
+             text:standard-style-list%))))
         (define message-editor (make-object (class message-editor-super%
                                               (inherit reset-region)
                                               
@@ -649,6 +650,12 @@
                 (if (string=? to "")
                     (send message-editor set-position (send message-editor paragraph-end-position 0))
                     (send message-editor set-position message-start)))
+              (send message-editor change-style
+                    (send (send message-editor get-style-list)
+                          find-named-style
+                          (editor:get-default-color-style-name))
+                    0 
+                    (send message-editor last-position))
               (send message-editor clear-undos)))
         
         (send message-editor set-modified #f)