--- a/ImageEditView.st	Sat Apr 02 17:11:06 2016 +0200
+++ b/ImageEditView.st	Sat Apr 02 17:11:07 2016 +0200
@@ -438,7 +438,7 @@
 
     currentPoint ~= lastPastePoint ifTrue:[              
         ClipboardMagnified isNil ifTrue:[
-            ClipboardMagnified := (Clipboard magnifiedBy: magnification) onDevice:self graphicsDevice
+            ClipboardMagnified := (Clipboard magnifiedBy: magnification) onDevice:device
         ].   
         extent := ClipboardMagnified extent.
 
@@ -494,7 +494,7 @@
     |ih iw magX magY minX maxX minY maxY lastColor lastY runW x0 maskColor mask
      sizeOfMaskPoint useNearestColor origin|
 
-    useNearestColor := self graphicsDevice visualType == #PseudoColor.
+    useNearestColor := device visualType == #PseudoColor.
 
     mask := image mask.
     ih := image height.
@@ -553,7 +553,7 @@
 
                 lastColor := color.
                 useNearestColor ifTrue:[
-                    lastColor := lastColor nearestOn:self graphicsDevice
+                    lastColor := lastColor nearestOn:device
                 ].
                 self paint:lastColor.
                 mask notNil ifTrue:[  
@@ -598,13 +598,13 @@
         Error handle:[:ex |
             Transcript showCR:'cannot convert image: ', ex description.
         ] do:[
-            devImage := image onDevice:self graphicsDevice.
+            devImage := image onDevice:device.
             devImage ~~ image ifTrue:[
                 image := devImage.
                 self changed:#image.
             ].
         ].
-        image device == self graphicsDevice ifTrue:[
+        image device == device ifTrue:[
             ^ super redrawX:x y:y width:w height:h
         ].
     ].
@@ -1934,7 +1934,7 @@
 
     |tempForm|
 
-    tempForm := Form extent:(image extent) depth:1 onDevice:(self device).
+    tempForm := Form extent:(image extent) depth:1 onDevice:device.
     tempForm clear.
     tempForm paint:(Color colorId:1).
     tempForm displayString:aString at:aPoint.
@@ -2160,7 +2160,7 @@
             Delay waitForSeconds:0.05
         ] ifFalse:[
             lastMp := mp.
-            mp := self graphicsDevice translatePoint:mp fromView:nil toView:self.
+            mp := device translatePoint:mp fromView:nil toView:self.
             "/ mp is a device coordinate here ...
             scrollX := 0.
             mp x > width ifTrue:[