--- a/DeviceGraphicsContext.st	Thu Oct 18 16:58:45 2001 +0200
+++ b/DeviceGraphicsContext.st	Thu Oct 18 17:00:25 2001 +0200
@@ -2074,7 +2074,7 @@
      noColor or allColor)."
 
     |id w h easy paintDither tmpForm tmpId tmpGCId 
-     fgId noColor allColor allBits pX pY
+     fgId noColor allColor allBits pX pY 
      mask maskId deviceForm deviceFormGCId deviceMask colorMap|
 
     w := aForm width.
@@ -2183,8 +2183,8 @@
                         aForm depth == 1 ifTrue:[
                             (colorMap := aForm colorMap) notNil ifTrue:[
                                 device 
-                                    setForeground:((colorMap at:2) onDevice:device) colorId 
-                                    background:((colorMap at:1) onDevice:device) colorId 
+                                    setForegroundColor:(colorMap at:2) 
+                                    backgroundColor:(colorMap at:1) 
                                     in:tmpGCId.
                             ].
                             device
@@ -2272,10 +2272,10 @@
 
                     "/ restore GC
                     foreground notNil ifTrue:[
-                        device setForeground:foreground colorId in:gcId.
+                        device setForegroundColor:foreground in:gcId.
                     ].
                     background notNil ifTrue:[
-                        device setBackground:background colorId in:gcId.
+                        device setBackgroundColor:background in:gcId 
                     ].
                     device setFunction:function in:gcId.
                     ^ self
@@ -3019,7 +3019,7 @@
             "/ draw fg dithered
             (mask depth == 1) ifTrue:[
                 device setBitmapMask:mask id in:gcId.
-                device setForeground:foreground colorId background:background colorId in:gcId.
+                device setForegroundColor:foreground backgroundColor:background in:gcId.
             ] ifFalse:[
                 device setPixmapMask:mask id in:gcId
             ].
@@ -3864,6 +3864,6 @@
 !DeviceGraphicsContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.81 2001-05-17 14:29:09 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceGraphicsContext.st,v 1.82 2001-10-18 15:00:25 james Exp $'
 ! !
 DeviceGraphicsContext initialize!