From 839511453226c9332a65083cfeec2e4eb0ebc763 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 5 Oct 2004 18:11:55 +0000
Subject: [PATCH] .

original commit: ce523772d603a91dbbf87711503fba57603189b9
---
 collects/framework/private/canvas.ss      | 13 +++++++++++--
 collects/framework/private/color-prefs.ss |  2 +-
 collects/framework/private/sig.ss         |  7 ++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/collects/framework/private/canvas.ss b/collects/framework/private/canvas.ss
index 0b27f014..1fa2e249 100644
--- a/collects/framework/private/canvas.ss
+++ b/collects/framework/private/canvas.ss
@@ -13,11 +13,19 @@
 	      [preferences : framework:preferences^]
 	      [frame : framework:frame^])
       
+      (rename [-color% color%])
+      
       (define basic<%> (interface ((class->interface editor-canvas%))))
       (define basic-mixin
 	(mixin ((class->interface editor-canvas%)) (basic<%>)
-          (super-new)
+          (super-new)))
+      
+      (define color<%> (interface (basic<%>)))
+      
+      (define color-mixin
+        (mixin (basic<%>) (color<%>)
           (define callback (lambda (p v) (set-canvas-background v)))
+          (super-new)
           (inherit set-canvas-background)
           (set-canvas-background (preferences:get 'framework:basic-canvas-background))
           (preferences:add-callback 'framework:basic-canvas-background callback #t)))
@@ -174,6 +182,7 @@
           (super-new)))
 
       (define basic% (basic-mixin editor-canvas%))
+      (define -color% (color-mixin basic%))
       (define info% (info-mixin basic%))
-      (define delegat% (delegate-mixin basic%))
+      (define delegate% (delegate-mixin basic%))
       (define wide-snip% (wide-snip-mixin basic%)))))
diff --git a/collects/framework/private/color-prefs.ss b/collects/framework/private/color-prefs.ss
index 242a9c06..fcfaa3a4 100644
--- a/collects/framework/private/color-prefs.ss
+++ b/collects/framework/private/color-prefs.ss
@@ -37,7 +37,7 @@
                                               style-name)])
                              (change-style style pos (+ pos offset) #f)))
                          (super-new))))
-        (define c (new canvas:basic%
+        (define c (new canvas:color%
                        (parent hp)
                        (editor e)
                        (style '(hide-hscroll
diff --git a/collects/framework/private/sig.ss b/collects/framework/private/sig.ss
index d6763b58..59664afd 100644
--- a/collects/framework/private/sig.ss
+++ b/collects/framework/private/sig.ss
@@ -338,14 +338,19 @@
 
   (define-signature framework:canvas-class^
     (basic<%>
+     color<%>
      delegate<%>
      info<%>
      wide-snip<%>
-     wide-snip%   
+     
      basic%
+     color%
      info%
+     delegate%
+     wide-snip%
 
      basic-mixin
+     color-mixin
      delegate-mixin
      info-mixin
      wide-snip-mixin))