--- a/ListView.st	Sun Apr 03 17:13:01 2016 +0100
+++ b/ListView.st	Sun Apr 03 19:25:10 2016 +0100
@@ -2460,8 +2460,8 @@
     "I cache font parameters here - they are used so often ..."
     self getFontParameters.
     self computeNumberOfLinesShown.
-    fgColor := fgColor onDevice:self graphicsDevice.
-    bgColor := bgColor onDevice:self graphicsDevice
+    fgColor := fgColor onDevice:device.
+    bgColor := bgColor onDevice:device
 !
 
 defaultControllerClass
@@ -2474,8 +2474,8 @@
 
     super fetchDeviceResources.
 
-    fgColor notNil ifTrue:[fgColor := fgColor onDevice:self graphicsDevice].
-    bgColor notNil ifTrue:[bgColor := bgColor onDevice:self graphicsDevice].
+    fgColor notNil ifTrue:[fgColor := fgColor onDevice:device].
+    bgColor notNil ifTrue:[bgColor := bgColor onDevice:device].
 
     "Created: 14.1.1997 / 00:12:12 / cg"
 !
@@ -2502,7 +2502,7 @@
     lineSpacing := 2.
     "/ q&d temporary hack.
     "/ X11 fonts are currently so ugly... add more spacing.
-    self graphicsDevice platformName = #X11 ifTrue:[
+    device platformName = #X11 ifTrue:[
         lineSpacing := lineSpacing + 3.
     ].
     fgColor := DefaultForegroundColor.
@@ -3707,7 +3707,7 @@
     line := list at:lineNr.
     list isNil ifTrue:[^ 0].
 
-    (d := self graphicsDevice) isNil ifTrue:[
+    (d := device) isNil ifTrue:[
         "/ mhmh - really dont know yet
         d := Screen current
     ].