EditTextView.st
branchjv
changeset 6086 58d88b144b2b
parent 6085 4ecbe3a93aec
parent 6070 18e8ef85aedf
child 6132 f0f9120765af
--- a/EditTextView.st	Wed Jan 25 17:40:20 2017 +0000
+++ b/EditTextView.st	Wed Feb 01 11:58:25 2017 +0000
@@ -1345,6 +1345,7 @@
 !
 
 st80Mode:aBooleanOrNil
+    <resource: #obsolete>
     self obsoleteMethodWarning.
     self st80EditMode:aBooleanOrNil
 
@@ -2606,15 +2607,15 @@
         super redrawVisibleLine:cursorVisibleLine col:cursorCol.
 
         char := self characterUnderCursor asString.
-        self paint:bgColor.                       
-        self displayRectangleX:x y:y width:(gc font widthOf:char) height:fontHeight-2.
+        gc paint:bgColor.
+        gc displayRectangleX:x y:y width:(gc font widthOf:char) height:fontHeight-2.
     ] ifFalse:[
         self paint:bgColor.
         cursorType == #ibeam ifTrue:[
             x1 := x - 1.
             y2 := y + fontHeight - lineSpacing - 1.
-            self displayLineFromX:x1 y:y toX:x1 y:y2.
-            self displayLineFromX:x y:y toX:x y:y2.
+            gc displayLineFromX:x1 y:y toX:x1 y:y2.
+            gc displayLineFromX:x y:y toX:x y:y2.
             ^ self
         ].
 
@@ -2622,10 +2623,10 @@
             x1 := x - 1.
             y := y + 1.
             y2 := y + fontHeight - lineSpacing - 1.
-            self displayLineFromX:x1 y:y toX:x1 y:y2.
-            self displayLineFromX:x y:y toX:x y:y2.
-            self displayLineFromX:x1-2 y:y toX:x+2 y:y.
-            self displayLineFromX:x1-2 y:y2 toX:x+2 y:y2.
+            gc displayLineFromX:x1 y:y toX:x1 y:y2.
+            gc displayLineFromX:x y:y toX:x y:y2.
+            gc displayLineFromX:x1-2 y:y toX:x+2 y:y.
+            gc displayLineFromX:x1-2 y:y2 toX:x+2 y:y2.
             ^ self
         ].
 
@@ -2644,20 +2645,20 @@
         self clippingBounds:(margin@margin extent:(width-margin) @ (height-margin)).
 
         cursorType == #caret ifTrue:[
-            self lineWidth:2.
-            self displayLineFromX:x1 y:y2 toX:x y:y.
-            self displayLineFromX:x y:y toX:x2 y:y2.
+            gc lineWidth:2.
+            gc displayLineFromX:x1 y:y2 toX:x y:y.
+            gc displayLineFromX:x y:y toX:x2 y:y2.
         ] ifFalse:[
             "anything else: solidCaret"
 
-            self fillPolygon:(Array with:(x1 @ y2)
-                                    with:(x @ y)
-                                    with:(x2 @ y2))
+            gc fillPolygon:(Array with:(x1 @ y2)
+                                  with:(x @ y)
+                                  with:(x2 @ y2))
         ].
 
         self clippingBounds:oldClip
     ].
-    self paint:oldPaint.
+    gc paint:oldPaint.
 
     "Modified: / 15.12.1999 / 22:24:17 / cg"
 !