--- a/Button.st	Sat Apr 02 17:09:51 2016 +0200
+++ b/Button.st	Sat Apr 02 17:09:52 2016 +0200
@@ -1542,7 +1542,7 @@
 viewBackground:something
     super viewBackground:something.
     something isColor ifTrue:[
-        self graphicsDevice hasGrayscales ifTrue:[
+        device hasGrayscales ifTrue:[
             halfLightColor notNil ifTrue:[
                 halfLightColor := (something averageColorIn:(0@0 corner:7@7)) lightened "on:device".
             ].
@@ -1755,7 +1755,7 @@
     |graphicsDevice|
 
     super fetchDeviceResources.
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
 
     disabledFgColor notNil ifTrue:[disabledFgColor := disabledFgColor onDevice:graphicsDevice].
     disabledEtchedFgColor notNil ifTrue:[disabledEtchedFgColor := disabledEtchedFgColor onDevice:graphicsDevice].
@@ -1796,7 +1796,7 @@
     |hasGreyscales nm graphicsDevice buttonStyle borderStyle|
 
     super initStyle.
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
 
     DefaultBorderWidth notNil ifTrue:[ self borderWidth: DefaultBorderWidth].
     DefaultForegroundColor notNil ifTrue:[fgColor := DefaultForegroundColor].
@@ -2267,8 +2267,8 @@
             sColor := formShadowColor.
             lColor := formLightColor.
         ] ifFalse:[
-            sColor := self graphicsDevice blackColor.
-            lColor := self graphicsDevice whiteColor.
+            sColor := device blackColor.
+            lColor := device whiteColor.
         ].
         self foreground:sColor.
         self displayForm:shadowForm x:x y:y.