--- a/ImageEditView.st	Thu Jan 26 02:48:45 2017 +0100
+++ b/ImageEditView.st	Sat Jan 28 18:29:19 2017 +0100
@@ -403,10 +403,10 @@
 drawFrame
     "draws a black frame around the image's bounds"
     
-    self paint:self blackColor.
-    self lineWidth: (magnification x//3 min: 3).
-    self displayRectangle: ((0@0) extent:(image extent * magnification) + margin).
-    self lineWidth:1.
+    gc paint:self blackColor.
+    gc lineWidth: (magnification x//3 min: 3).
+    gc displayRectangle: ((0@0) extent:(image extent * magnification) + margin).
+    gc lineWidth:1.
 !
 
 drawFramesIn: aRectangle
@@ -422,15 +422,15 @@
         lineStartingPoint := origin + (0 @ mY).
         lineEndingPoint   := lineStartingPoint + (aRectangle width@0).
 
-        oldColor := self paint.
-        self xoring:[
-            self displayLineFrom: lineStartingPoint to: lineEndingPoint.
+        oldColor := gc paint.
+        gc xoring:[
+            gc displayLineFrom: lineStartingPoint to: lineEndingPoint.
             lineStartingPoint x to: lineStartingPoint x + aRectangle width - mX by: mX 
             do:[:x|   
-                self displayLineFrom: x@(origin y) to: x@(origin y + mY)
+                gc displayLineFrom: x@(origin y) to: x@(origin y + mY)
             ].
         ].
-        self paint: oldColor.
+        gc paint: oldColor.
     ]
 !
 
@@ -548,7 +548,7 @@
                     (unmaskedOnly not or:[maskColor not]) ifTrue:[
                         self fillFramedRectangle: (origin extent: (runW@magY)).                    
                         maskColor ifTrue:[
-                            self xoring: [self fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)]
+                            gc xoring: [gc fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)]
                         ]
                     ].
                     runW := 0.
@@ -563,7 +563,7 @@
                     (unmaskedOnly not or:[maskColor not]) ifTrue:[
                         self fillFramedRectangle: (origin extent: (runW@magY)).
                         maskColor ifTrue:[
-                            self xoring: [self fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)]
+                            gc xoring: [gc fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)]
                         ].
                     ].
                     runW := 0.
@@ -573,12 +573,12 @@
                 useNearestColor ifTrue:[
                     lastColor := lastColor nearestOn:device
                 ].
-                self paint:lastColor.
+                gc paint:lastColor.
                 mask notNil ifTrue:[  
                     maskColor := false.
                     (mask pixelAtX:xx y:yy) == 0 ifTrue:[
                         unmaskedOnly ifFalse:[
-                            self paint: (lastColor := self viewBackground).
+                            gc paint: (lastColor := self viewBackground).
                         ].
                         maskColor := true.
                     ].
@@ -595,8 +595,8 @@
         (unmaskedOnly not or:[maskColor not]) ifTrue:[
             self fillFramedRectangle: (origin extent: runW@magY).
             maskColor ifTrue:[
-                self xoring:[
-                    self fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)
+                gc xoring:[
+                    gc fillRectangle: (origin + sizeOfMaskPoint extent: sizeOfMaskPoint)
                 ]
             ].
         ]
@@ -2343,8 +2343,8 @@
 "/                    ].
                     invertOutside ifFalse:[    
                         self redraw: ((firstPoint min: lastCurrentPoint) - 1 extent: (firstPoint - lastCurrentPoint) abs + 2).
-                        self xoring: [ 
-                            self fillRectangle: ((firstPoint min: currentPoint) + margin extent: currentExtent - gridCorrection) 
+                        gc xoring: [ 
+                            gc fillRectangle: ((firstPoint min: currentPoint) + margin extent: currentExtent - gridCorrection) 
                         ]
                     ].
                 ].
@@ -2361,26 +2361,26 @@
                     self redraw: ((origin x@(origin y + lineWidthY)) extent: (lineWidthX@(0 max: (extent y - (lineWidthY * 2))))).
                     self redraw: (((origin x + extent x - lineWidthX)@(origin y + lineWidthY)) extent: (lineWidthX@(extent y - (lineWidthY * 2)))).
                     (self selectedColor ~= Color noColor)
-                        ifTrue: [self paint: self selectedColor]
-                        ifFalse: [self paint: self viewBackground]. 
+                        ifTrue: [gc paint: self selectedColor]
+                        ifFalse: [gc paint: self viewBackground]. 
                     origin := (firstPoint min: currentPoint) + margin.
                     extent := currentExtent - gridCorrection.
                     lineWidthY := extent y min: magnification y.
                     lineWidthX := extent x min: magnification x.
                     (lineWidthY > 0 and: [lineWidthX > 0]) ifTrue:[
-                        self fillRectangle: (origin extent: (extent x@lineWidthY)).
-                        self fillRectangle: ((origin x@(origin y + extent y - lineWidthY)) extent: (extent x@lineWidthY)).
-                        self fillRectangle: ((origin x@(origin y + lineWidthY)) extent: (lineWidthX@(0 max: (extent y - (lineWidthY * 2))))).
-                        self fillRectangle: (((origin x + extent x - lineWidthX)@(origin y + lineWidthY)) extent: (lineWidthX@(extent y - (lineWidthY * 2)))).
+                        gc fillRectangle: (origin extent: (extent x@lineWidthY)).
+                        gc fillRectangle: ((origin x@(origin y + extent y - lineWidthY)) extent: (extent x@lineWidthY)).
+                        gc fillRectangle: ((origin x@(origin y + lineWidthY)) extent: (lineWidthX@(0 max: (extent y - (lineWidthY * 2))))).
+                        gc fillRectangle: (((origin x + extent x - lineWidthX)@(origin y + lineWidthY)) extent: (lineWidthX@(extent y - (lineWidthY * 2)))).
                     ]
                 ].
                 
                 emphasis == #filledBox ifTrue:[
                     self redraw: ((firstPoint min: lastCurrentPoint) - 1 extent: (firstPoint - lastCurrentPoint) abs + 2).
                     (self selectedColor ~= Color noColor)
-                        ifTrue: [self paint: self selectedColor]
-                        ifFalse: [self paint: self viewBackground].
-                    self fillRectangle: ((firstPoint min: currentPoint) + margin extent: currentExtent - gridCorrection).
+                        ifTrue: [gc paint: self selectedColor]
+                        ifFalse: [gc paint: self viewBackground].
+                    gc fillRectangle: ((firstPoint min: currentPoint) + margin extent: currentExtent - gridCorrection).
                 ].
             ]. 
             lastCurrentPoint := currentPoint.