--- a/SelectionInListView.st	Mon Jan 16 19:58:26 2017 +0000
+++ b/SelectionInListView.st	Wed Jan 25 17:40:20 2017 +0000
@@ -1493,10 +1493,9 @@
 
     (shown and:[hilightLevel ~~ 0]) ifTrue:[
         selection == firstLineShown ifTrue:[
-           self paint:bgColor.
-           self fillRectangleX:margin y:margin
-                          width:(width - (margin * 2)) 
-                         height:(hilightLevel abs).
+           gc paint:bgColor.
+           gc fillRectangleX:margin y:margin
+              width:(width - (margin * 2)) height:(hilightLevel abs).
         ].
     ].
 
@@ -2072,25 +2071,25 @@
             "
              a line above and below
             "
-            self paint:hilightFrameColor.
-            self displayLineFromX:0 y:y toX:width y:y.
+            gc paint:hilightFrameColor.
+            gc displayLineFromX:0 y:y toX:width y:y.
             y2 := y + fontHeight - 1.
-            self displayLineFromX:0 y:y2 toX:width y:y2.
+            gc displayLineFromX:0 y:y2 toX:width y:y2.
             ^ self
         ]
     ] ifFalse:[
         hilightStyle == #motif ifTrue:[
             "/ an additional line, inset by one pixel
-            self paint:fg.
-            self displayLineFromX:0 y:y+1 toX:width y:y+1.
+            gc paint:fg.
+            gc displayLineFromX:0 y:y+1 toX:width y:y+1.
             y2 := y + fontHeight - 1 - 1.
-            self displayLineFromX:0 y:y2 toX:width y:y2.
+            gc displayLineFromX:0 y:y2 toX:width y:y2.
         ] ifFalse:[
             hilightStyle == #macosx ifTrue:[
                 "/ an additional line, at the bottom
-                self paint:viewBackground.
+                gc paint:viewBackground.
                 y2 := y + fontHeight - 1.
-                self displayLineFromX:0 y:y2 toX:width y:y2.
+                gc displayLineFromX:0 y:y2 toX:width y:y2.
             ]
         ].
     ].
@@ -2150,14 +2149,14 @@
     "/ if an explicit drawing block has been defined - let it do it.
     selectedVisualBlock notNil ifTrue:[
         backgroundAlreadyClearedColor == bg ifFalse:[
-            self paint:bg.
-            self fillRectangleX:margin y:y - (lineSpacing//2)
+            gc paint:bg.
+            gc fillRectangleX:margin y:y - (lineSpacing//2)
                           width:(width - (2 * margin)) 
                          height:fontHeight.
         ].
 
         dObj := selectedVisualBlock value:self value:listLine.
-        self paint:fg on:bg.
+        gc paint:fg on:bg.
         dObj displayOn:self x:(textStartLeft-viewOrigin x) y:y + gc font ascent opaque:true.
         
         self drawSelectionHighlightFrameForItemAtY:y with:fg.
@@ -2167,9 +2166,9 @@
     strikeOut ifTrue:[
         self drawVisibleLine:visLineNr with:fgColor and:bgColor.
 
-        self paint:fgColor.
+        gc paint:fgColor.
         y := y + (fontHeight // 2).
-        self displayLineFromX:0 y:y toX:width y:y.
+        gc displayLineFromX:0 y:y toX:width y:y.
         ^ self
     ].
 
@@ -3478,14 +3477,14 @@
             y := self yOfVisibleLine:visLineNr.
 
             backgroundAlreadyClearedColor == bg ifFalse:[
-                self paint:bg.
-                self fillRectangleX:margin y:y - (lineSpacing//2)
+                gc paint:bg.
+                gc fillRectangleX:margin y:y - (lineSpacing//2)
                               width:(width - (2 * margin)) 
                              height:fontHeight.
             ].
 
             dObj := visualBlock value:self value:listLine.
-            self paint:fg on:bg.
+            gc paint:fg on:bg.
             dObj displayOn:self x:(textStartLeft - viewOrigin) x y:y + gc font ascent opaque:true.
             ^ self
         ].