--- a/Tools__CodeView2.st	Tue Jan 24 14:56:29 2017 +0100
+++ b/Tools__CodeView2.st	Tue Jan 24 23:28:01 2017 +0100
@@ -2958,18 +2958,18 @@
 
 
     textView reallyModified ifFalse:[
-        self fillRectangleX:x y:y width:rw height:h color: self viewBackground
+        gc fillRectangleX:x y:y width:rw height:h color: self viewBackground
     ] ifTrue:[
         acceptBottom := self acceptButtonBottom.
         cancelBottom := self cancelButtonBottom.
         y < acceptBottom ifTrue:[
-            self fillRectangleX:x y:y width:rw height: ((y + h) min: acceptBottom) color: acceptColor.
+            gc fillRectangleX:x y:y width:rw height: ((y + h) min: acceptBottom) color: acceptColor.
         ].
         (y < cancelBottom) ifTrue:[
-            self fillRectangleX:x y: acceptBottom + 1width:rw height: ((y + h) min: cancelBottom) - acceptBottom - 1color: cancelColor.
+            gc fillRectangleX:x y: acceptBottom + 1width:rw height: ((y + h) min: cancelBottom) - acceptBottom - 1color: cancelColor.
         ].
         (y + h >= cancelBottom) ifTrue:[
-            self fillRectangleX:x y: cancelBottom + 1 width:rw height: (y + h) - cancelBottom - 1 color: diffColor.
+            gc fillRectangleX:x y: cancelBottom + 1 width:rw height: (y + h) - cancelBottom - 1 color: diffColor.
         ]
 
     ]
@@ -3043,13 +3043,13 @@
         requiredW := textW + self padding.
 
         oldFont := myFont.
-        oldColor := self paint.
+        oldColor := gc paint.
 
         newFont := self lineFontForLine:line.
         newFont isNil ifTrue:[
             newFont := oldFont.
             newColor := self lineColorForLine:line.
-            newColor notNil ifTrue:[ self paint:newColor ].
+            newColor notNil ifTrue:[ gc paint:newColor ].
         ].
         newFont ~~ oldFont ifTrue:[
             "/ ensure that the line number lines are not higher than the text lines
@@ -3072,9 +3072,9 @@
     yBaseline := yTop + fontAscent.
 
     cleared ifFalse:[
-        self clearRectangleX:0 y:yBaseline - myFontAscent
-             width:width - 2
-             height:myFontAscent + myFontDescent.
+        gc 
+            clearRectangleX:0 y:(yBaseline - myFontAscent) 
+            width:(width - 2) height:(myFontAscent + myFontDescent).
     ].
 
     "/ cg: this should be done differently: services know about the
@@ -3093,12 +3093,12 @@
     ].
 
     showLineNumbers ifTrue:[
-        self displayString:lineString x:(width - widthDiffInfo - textW) y:yBaseline.
+        gc displayString:lineString x:(width - widthDiffInfo - textW) y:yBaseline.
         newFont notNil ifTrue:[
-            self font:oldFont.
-            self paint:oldColor
+            gc font:oldFont.
+            gc paint:oldColor
         ] ifFalse:[
-            newColor notNil ifTrue:[ self paint:oldColor ].
+            newColor notNil ifTrue:[ gc paint:oldColor ].
         ].
     ].