--- a/Label.st	Sat Apr 02 17:09:32 2016 +0200
+++ b/Label.st	Sat Apr 02 17:09:34 2016 +0200
@@ -958,7 +958,7 @@
     aColor ~~ bgColor ifTrue:[
         bgColor := aColor.
         bgColor notNil ifTrue:[
-            bgColor := bgColor onDevice:self graphicsDevice.
+            bgColor := bgColor onDevice:device.
             self class == Label ifTrue:[
                 super viewBackground:bgColor
             ].
@@ -982,7 +982,7 @@
     aColor ~~ etchedFgColor ifTrue:[
         etchedFgColor := aColor.
         etchedFgColor notNil ifTrue:[
-            etchedFgColor := etchedFgColor onDevice:self graphicsDevice.
+            etchedFgColor := etchedFgColor onDevice:device.
         ].
         self invalidateRepairNow:true
     ].
@@ -998,7 +998,7 @@
     "set the foreground color"
 
     aColor ~~ fgColor ifTrue:[
-        fgColor := aColor onDevice:self graphicsDevice.
+        fgColor := aColor onDevice:device.
         self invalidateRepairNow:true
     ].
 
@@ -1010,8 +1010,8 @@
     "set the colors to be used for drawing"
 
     (fgColor ~~ fg or:[bgColor ~~ bg]) ifTrue:[
-        fgColor := fg onDevice:self graphicsDevice.
-        bgColor := bg onDevice:self graphicsDevice.
+        fgColor := fg onDevice:device.
+        bgColor := bg onDevice:device.
         self class == Label ifTrue:[
             super viewBackground:bgColor
         ].
@@ -1392,8 +1392,8 @@
 
     super fetchDeviceResources.
 
-    fgColor := fgColor onDevice:self graphicsDevice.
-    bgColor := bgColor onDevice:self graphicsDevice.
+    fgColor := fgColor onDevice:device.
+    bgColor := bgColor onDevice:device.
 
     "Created: / 13.1.1997 / 23:34:30 / cg"
     "Modified: / 15.1.1998 / 00:13:46 / stefan"
@@ -1820,7 +1820,7 @@
                 y := currentTransformation applyInverseScaleY:y.
             ].
 
-            logo := logo onDevice:self graphicsDevice.
+            logo := logo onDevice:device.
 "/            self background:bg.
             self drawImageLogo:logo x:x y:y opaque:doClear.
         ] ifFalse:[