--- a/DeviceWorkstation.st	Mon Feb 11 20:59:40 2002 +0100
+++ b/DeviceWorkstation.st	Tue Feb 12 18:10:06 2002 +0100
@@ -5054,16 +5054,17 @@
     ^ self subclassResponsibility
 !
 
-setBackgroundColor:bgColor in:aGCId
+setBackgroundColor:color in:aGCId
     "set background color to be drawn with"
 
     |colorId deviceColor|
 
-    colorId := bgColor colorId.
-    (colorId isNil or:[bgColor device ~~ self]) ifTrue:[
-        deviceColor := bgColor onDevice:self.
+    (color isOnDevice:self) ifTrue:[
+        colorId := color colorId.
+    ] ifFalse:[
+        deviceColor := color onDevice:self.
         deviceColor notNil ifTrue:[
-            colorId := bgColor colorId.
+            colorId := deviceColor colorId.
         ]
     ].
     colorId isNil ifTrue:[
@@ -5127,16 +5128,17 @@
     self setBackgroundColor:bgColor in:aGCId.
 !
 
-setForegroundColor:fgColor in:aGCId
+setForegroundColor:color in:aGCId
     "set the foreground color to be drawn with"
 
     |colorId deviceColor|
 
-    colorId := fgColor colorId.
-    (colorId isNil or:[fgColor device ~~ self]) ifTrue:[
-        deviceColor := fgColor onDevice:self.
+    (color isOnDevice:self) ifTrue:[
+        colorId := color colorId.
+    ] ifFalse:[
+        deviceColor := color onDevice:self.
         deviceColor notNil ifTrue:[
-            colorId := fgColor colorId.
+            colorId := deviceColor colorId.
         ]
     ].
     colorId isNil ifTrue:[
@@ -7438,6 +7440,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.408 2001-12-06 10:19:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.409 2002-02-12 17:10:06 stefan Exp $'
 ! !
 DeviceWorkstation initialize!