--- a/ListModelView.st	Tue Feb 18 15:48:35 2014 +0100
+++ b/ListModelView.st	Tue Feb 18 15:49:19 2014 +0100
@@ -433,12 +433,12 @@
     "set the foreground color
     "
     (aColor notNil and:[fgColor ~~ aColor]) ifTrue:[
-	self realized ifTrue:[
-	    fgColor := aColor onDevice:device.
-	    self invalidate
-	] ifFalse:[
-	    fgColor := aColor
-	]
+        self realized ifTrue:[
+            fgColor := aColor onDevice:self graphicsDevice.
+            self invalidate
+        ] ifFalse:[
+            fgColor := aColor
+        ]
     ]
 !
 
@@ -468,13 +468,13 @@
     "set the background color
     "
     (aColor notNil and:[bgColor ~~ aColor]) ifTrue:[
-	bgColor := aColor.
-	super viewBackground:bgColor.
-
-	self realized ifTrue:[
-	    bgColor := bgColor onDevice:device.
-	    self invalidate
-	].
+        bgColor := aColor.
+        super viewBackground:bgColor.
+
+        self realized ifTrue:[
+            bgColor := bgColor onDevice:self graphicsDevice.
+            self invalidate
+        ].
     ].
 ! !
 
@@ -1052,7 +1052,7 @@
 colorOnDevice:aColor
     "fetch a device colors
     "
-    ^ aColor notNil ifTrue:[aColor onDevice:device] ifFalse:[nil]
+    ^ aColor notNil ifTrue:[aColor onDevice:self graphicsDevice] ifFalse:[nil]
 !
 
 imageOnMyDevice:anImage
@@ -1063,9 +1063,9 @@
 
     anImage isNil ifTrue:[^ anImage].
 
-    deviceImage := anImage onDevice:device.
+    deviceImage := anImage onDevice:self graphicsDevice.
     deviceImage isImage ifTrue:[
-	deviceImage clearMaskedPixels.
+        deviceImage clearMaskedPixels.
     ].
     ^ deviceImage
 "/    |image|
@@ -3406,11 +3406,11 @@
 !ListModelView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.139 2014-02-13 18:47:53 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.140 2014-02-18 14:49:19 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.139 2014-02-13 18:47:53 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ListModelView.st,v 1.140 2014-02-18 14:49:19 stefan Exp $'
 ! !