--- a/SelectionInListView.st	Sat Apr 02 11:06:59 2016 +0100
+++ b/SelectionInListView.st	Sun Apr 03 17:13:01 2016 +0100
@@ -2012,8 +2012,8 @@
         itemHeight := item heightOn:self.
     ].
 
-    (self graphicsDevice depth == 1 or:[arrowLevel == 0]) ifTrue:[
-        form := self class rightArrowFormOn:self graphicsDevice.
+    (device depth == 1 or:[arrowLevel == 0]) ifTrue:[
+        form := self class rightArrowFormOn:device.
         form notNil ifTrue:[
             y := y + ((itemHeight - form height) // 2).
             self foreground:(
@@ -2024,11 +2024,11 @@
         ]
     ] ifFalse:[
         smallArrow ifTrue:[
-            form := self class smallRightArrowLightFormOn:self graphicsDevice.
-            form2 := self class smallRightArrowShadowFormOn:self graphicsDevice.
+            form := self class smallRightArrowLightFormOn:device.
+            form2 := self class smallRightArrowShadowFormOn:device.
         ] ifFalse:[
-            form := self class rightArrowLightFormOn:self graphicsDevice.
-            form2 := self class rightArrowShadowFormOn:self graphicsDevice.
+            form := self class rightArrowLightFormOn:device.
+            form2 := self class rightArrowShadowFormOn:device.
         ].
         (form isNil or:[form2 isNil]) ifTrue:[
             "/ very bad conditions
@@ -2815,7 +2815,7 @@
     |graphicsDevice|
 
     super fetchDeviceResources.
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
 
     hilightFgColor notNil ifTrue:[hilightFgColor := hilightFgColor onDevice:graphicsDevice].
     hilightBgColor notNil ifTrue:[hilightBgColor := hilightBgColor onDevice:graphicsDevice].
@@ -2845,7 +2845,7 @@
     arrowLevel := 1.
     smallArrow := false.
 
-    self graphicsDevice hasGrayscales ifTrue:[
+    device hasGrayscales ifTrue:[
         "
          must get rid of these hard codings
         "
@@ -2917,7 +2917,7 @@
     #hack.
     "/ 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.
     ].
     hilightFgColor isNil ifTrue:[