--- a/UIPainterView.st	Sat Apr 02 17:12:59 2016 +0200
+++ b/UIPainterView.st	Sat Apr 02 17:13:00 2016 +0200
@@ -414,7 +414,7 @@
         "/ ignore the selection and paste where we drop!!
         pastePoint := aPointOrNilOrKeep.
         pastePoint isNil ifTrue:[
-            pastePoint := self graphicsDevice 
+            pastePoint := device 
                                 translatePoint:(sensor mousePoint)
                                 fromView:nil
                                 toView:self.
@@ -505,14 +505,14 @@
                 ] ifFalse:[
                     thisAbsOrigin := uiPainterAttributes at:#absOrigin.
 
-                    newOrigin := self graphicsDevice 
+                    newOrigin := device 
                                         translatePoint:thisAbsOrigin
                                         fromView:self
                                         toView:containerToPasteInto.
                 ].
             ] ifFalse:[
                 pastePoint isNil ifTrue:[ pastePoint := 0@0 ].
-                newOrigin := self graphicsDevice 
+                newOrigin := device 
                                     translatePoint:pastePoint
                                     fromView:self
                                     toView:containerToPasteInto.
@@ -1993,9 +1993,9 @@
     "colors on device"
     
     super create.
-    handleColorBlack := handleColorBlack onDevice:self graphicsDevice.
-    handleColorWhite := handleColorWhite onDevice:self graphicsDevice.
-    handleMasterColor := handleMasterColor onDevice:self graphicsDevice.
+    handleColorBlack := handleColorBlack onDevice:device.
+    handleColorWhite := handleColorWhite onDevice:device.
+    handleMasterColor := handleMasterColor onDevice:device.
 !
 
 initialize