more 16bit fixes
authorClaus Gittinger <cg@exept.de>
Fri, 23 Feb 1996 19:14:41 +0100
changeset 387 bf7217524026
parent 386 514f73e07c2d
child 388 171abdb45624
more 16bit fixes
ETxtView.st
EditTextView.st
--- a/ETxtView.st	Fri Feb 23 19:13:53 1996 +0100
+++ b/ETxtView.st	Fri Feb 23 19:14:41 1996 +0100
@@ -1182,17 +1182,17 @@
     list isNil ifTrue:[^ self].
 
     (startLine == endLine) ifTrue:[
-	"delete chars within a line"
-	self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
-	^ self
+        "delete chars within a line"
+        self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
+        ^ self
     ].
 
     ((startCol == 1) and:[endCol == 0]) ifTrue:[
-	"delete full lines only"
-	endLine > startLine ifTrue:[
-	    self deleteFromLine:startLine toLine:(endLine - 1)
-	].
-	^ self
+        "delete full lines only"
+        endLine > startLine ifTrue:[
+            self deleteFromLine:startLine toLine:(endLine - 1)
+        ].
+        ^ self
     ].
 
     "delete right rest of 1st line"
@@ -1200,30 +1200,32 @@
 
     "delete the inner lines ..."
     endLine > (startLine + 1) ifTrue:[
-	self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
+        self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
     ].
 
     (endCol ~~ 0) ifTrue:[
-	"delete the left rest of the last line"
-	self deleteCharsAtLine:(startLine + 1) toCol:endCol.
-
-	"must add blanks, if startCal lies behond end of startLine"
-	line := list at:startLine.
-	lineSize := line size.
-	(startCol > lineSize) ifTrue:[
-	    line isNil ifTrue:[
-		line := String new:(startCol - 1)
-	    ] ifFalse:[
-		line := line , (String new:(startCol - 1 - lineSize))
-	    ].
-	    list at:startLine put:line.
-	    widthOfWidestLine := nil. "/ i.e. unknown
-	    self textChanged.
-	]
+        "delete the left rest of the last line"
+        self deleteCharsAtLine:(startLine + 1) toCol:endCol.
+
+        "must add blanks, if startCal lies behond end of startLine"
+        line := list at:startLine.
+        lineSize := line size.
+        (startCol > lineSize) ifTrue:[
+            line isNil ifTrue:[
+                line := String new:(startCol - 1)
+            ] ifFalse:[
+                line := line , (line species new:(startCol - 1 - lineSize))
+            ].
+            list at:startLine put:line.
+            widthOfWidestLine := nil. "/ i.e. unknown
+            self textChanged.
+        ]
     ].
 
     "merge the left rest of 1st line with right rest of last line into one"
     self mergeLine:startLine
+
+    "Modified: 23.2.1996 / 19:08:21 / cg"
 !
 
 deleteFromLine:startLineNr toLine:endLineNr
@@ -1353,8 +1355,8 @@
             ^ self
         ]
     ].
-    (lineSize == 0) ifTrue: [
-        newLine := String new:colNr.
+    (lineSize == 0) ifTrue:[
+        newLine := aCharacter asString species new:colNr.
         drawCharacterOnly := true
     ] ifFalse: [
         (colNr > lineSize) ifTrue: [
@@ -1388,7 +1390,7 @@
         ]
     ]
 
-    "Modified: 23.2.1996 / 17:41:49 / cg"
+    "Modified: 23.2.1996 / 19:09:36 / cg"
 !
 
 insertCharAtCursor:aCharacter
@@ -1925,7 +1927,7 @@
         newLine := aString
     ] ifFalse:[
         (lineSize == 0) ifTrue: [
-            newLine := String new:(colNr + strLen - 1)
+            newLine := aString species new:(colNr + strLen - 1)
         ] ifFalse: [
             (colNr > lineSize) ifTrue: [
                 newLine := line species new:(colNr + strLen - 1).
@@ -1953,7 +1955,7 @@
     ].
     self textChanged.
 
-    "Modified: 23.2.1996 / 17:42:47 / cg"
+    "Modified: 23.2.1996 / 19:10:17 / cg"
 ! !
 
 !EditTextView methodsFor:'event processing'!
@@ -3198,5 +3200,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.47 1996-02-23 17:06:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.48 1996-02-23 18:14:41 cg Exp $'
 ! !
--- a/EditTextView.st	Fri Feb 23 19:13:53 1996 +0100
+++ b/EditTextView.st	Fri Feb 23 19:14:41 1996 +0100
@@ -1182,17 +1182,17 @@
     list isNil ifTrue:[^ self].
 
     (startLine == endLine) ifTrue:[
-	"delete chars within a line"
-	self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
-	^ self
+        "delete chars within a line"
+        self deleteCharsAtLine:startLine fromCol:startCol toCol:endCol.
+        ^ self
     ].
 
     ((startCol == 1) and:[endCol == 0]) ifTrue:[
-	"delete full lines only"
-	endLine > startLine ifTrue:[
-	    self deleteFromLine:startLine toLine:(endLine - 1)
-	].
-	^ self
+        "delete full lines only"
+        endLine > startLine ifTrue:[
+            self deleteFromLine:startLine toLine:(endLine - 1)
+        ].
+        ^ self
     ].
 
     "delete right rest of 1st line"
@@ -1200,30 +1200,32 @@
 
     "delete the inner lines ..."
     endLine > (startLine + 1) ifTrue:[
-	self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
+        self deleteFromLine:(startLine + 1) toLine:(endLine - 1)
     ].
 
     (endCol ~~ 0) ifTrue:[
-	"delete the left rest of the last line"
-	self deleteCharsAtLine:(startLine + 1) toCol:endCol.
-
-	"must add blanks, if startCal lies behond end of startLine"
-	line := list at:startLine.
-	lineSize := line size.
-	(startCol > lineSize) ifTrue:[
-	    line isNil ifTrue:[
-		line := String new:(startCol - 1)
-	    ] ifFalse:[
-		line := line , (String new:(startCol - 1 - lineSize))
-	    ].
-	    list at:startLine put:line.
-	    widthOfWidestLine := nil. "/ i.e. unknown
-	    self textChanged.
-	]
+        "delete the left rest of the last line"
+        self deleteCharsAtLine:(startLine + 1) toCol:endCol.
+
+        "must add blanks, if startCal lies behond end of startLine"
+        line := list at:startLine.
+        lineSize := line size.
+        (startCol > lineSize) ifTrue:[
+            line isNil ifTrue:[
+                line := String new:(startCol - 1)
+            ] ifFalse:[
+                line := line , (line species new:(startCol - 1 - lineSize))
+            ].
+            list at:startLine put:line.
+            widthOfWidestLine := nil. "/ i.e. unknown
+            self textChanged.
+        ]
     ].
 
     "merge the left rest of 1st line with right rest of last line into one"
     self mergeLine:startLine
+
+    "Modified: 23.2.1996 / 19:08:21 / cg"
 !
 
 deleteFromLine:startLineNr toLine:endLineNr
@@ -1353,8 +1355,8 @@
             ^ self
         ]
     ].
-    (lineSize == 0) ifTrue: [
-        newLine := String new:colNr.
+    (lineSize == 0) ifTrue:[
+        newLine := aCharacter asString species new:colNr.
         drawCharacterOnly := true
     ] ifFalse: [
         (colNr > lineSize) ifTrue: [
@@ -1388,7 +1390,7 @@
         ]
     ]
 
-    "Modified: 23.2.1996 / 17:41:49 / cg"
+    "Modified: 23.2.1996 / 19:09:36 / cg"
 !
 
 insertCharAtCursor:aCharacter
@@ -1925,7 +1927,7 @@
         newLine := aString
     ] ifFalse:[
         (lineSize == 0) ifTrue: [
-            newLine := String new:(colNr + strLen - 1)
+            newLine := aString species new:(colNr + strLen - 1)
         ] ifFalse: [
             (colNr > lineSize) ifTrue: [
                 newLine := line species new:(colNr + strLen - 1).
@@ -1953,7 +1955,7 @@
     ].
     self textChanged.
 
-    "Modified: 23.2.1996 / 17:42:47 / cg"
+    "Modified: 23.2.1996 / 19:10:17 / cg"
 ! !
 
 !EditTextView methodsFor:'event processing'!
@@ -3198,5 +3200,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.47 1996-02-23 17:06:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.48 1996-02-23 18:14:41 cg Exp $'
 ! !