class: ListView
changed:13 methods
replace foo isMemberOf:String
by isSingleByteString
--- a/ListView.st Fri Jul 11 01:26:44 2014 +0200
+++ b/ListView.st Sat Jul 12 07:39:50 2014 +0200
@@ -701,7 +701,7 @@
list add:aString.
includesNonStrings ifFalse:[
- includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+ includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
includesNonStrings ifTrue:[
fontHeightBefore := fontHeight.
self getFontParameters.
@@ -736,7 +736,7 @@
].
includesNonStrings ifFalse:[
- includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+ includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
"/ includesNonStrings ifTrue:[self getFontParameters].
].
shown ifTrue:[
@@ -773,7 +773,7 @@
includesNonStrings :=
aCollectionOfLines
contains:[:someLine |
- someLine notNil and:[(someLine isMemberOf:String) not].
+ someLine notNil and:[(someLine isSingleByteString) not].
]
].
@@ -1555,10 +1555,10 @@
didIncludeNonStrings := includesNonStrings.
includesNonStrings ifFalse:[
- includesNonStrings := (aString notNil and:[(aString isMemberOf:String) not]).
+ includesNonStrings := (aString notNil and:[(aString isSingleByteString) not]).
] ifTrue:[
- (aString isNil or:[(aString isMemberOf:String)]) ifTrue:[
- includesNonStrings := list contains:[:l | l notNil and:[(l isMemberOf:String) not]].
+ (aString isNil or:[(aString isSingleByteString)]) ifTrue:[
+ includesNonStrings := list contains:[:l | l notNil and:[(l isSingleByteString) not]].
]
].
@@ -2065,7 +2065,7 @@
yf := y - (lineSpacing // 2).
len := lineString size.
- (lineString notNil and:[(lineString isMemberOf:String) not ])
+ (lineString notNil and:[lineString isString not ])
ifTrue:[
w := lineString widthFrom:sCol to:(endCol min:len) on:self.
endCol > len ifTrue:[
@@ -2110,7 +2110,7 @@
lineString := self withoutColorEmphasis:lineString ifFg:fg andBg:bg.
backgroundAlreadyClearedColor == bg ifFalse:[
- (lineString isMemberOf:String) ifTrue:[
+ (lineString isSingleByteString) ifTrue:[
fontIsFixedWidth ifTrue:[
w := (eCol - sCol + 1) * fontWidth
] ifFalse:[
@@ -2377,7 +2377,7 @@
] ifFalse:[
line := self visibleAt:startLine.
- (fontIsFixedWidth and:[line isMemberOf:String]) ifFalse:[
+ (fontIsFixedWidth and:[line isSingleByteString]) ifFalse:[
"start/end col has to be computed for each line"
startLine to:stopLine do:[:i |
@@ -2397,7 +2397,7 @@
endCol > 0 ifTrue:[
startLine to:stopLine do:[:i |
line := self visibleAt:i.
- (line isMemberOf:String) ifTrue:[
+ (line isSingleByteString) ifTrue:[
self redrawVisibleLine:i from:startCol to:endCol
] ifFalse:[
self redrawVisibleLine:i
@@ -2848,7 +2848,7 @@
thisLine isNil ifTrue:[
maxSoFar
] ifFalse:[
- (thisLine isMemberOf:String) ifTrue:[
+ (thisLine isSingleByteString) ifTrue:[
maxSoFar
] ifFalse:[
maxSoFar max:(thisLine heightOn:self)
@@ -3051,7 +3051,7 @@
newEntry isNil ifTrue:[
newW := 0
] ifFalse:[
- (newEntry isMemberOf:String) ifTrue:[
+ (newEntry isSingleByteString) ifTrue:[
newW := font widthOf:newEntry
] ifFalse:[
newW := newEntry widthOn:self
@@ -3064,7 +3064,7 @@
oldEntry isNil ifTrue:[
oldW := 0
] ifFalse:[
- (oldEntry isMemberOf:String) ifTrue:[
+ (oldEntry isSingleByteString) ifTrue:[
oldW := font widthOf:oldEntry
] ifFalse:[
oldW := oldEntry widthOn:self
@@ -3187,7 +3187,7 @@
"return the width of an entry"
entry isNil ifTrue:[^ 0].
- (entry isMemberOf:String) ifTrue:[
+ (entry isSingleByteString) ifTrue:[
^ font widthOf:entry
].
^ entry widthOn:self
@@ -3224,7 +3224,7 @@
self from:first to:last do:[:line |
line notNil ifTrue:[
- (line isMemberOf:String) ifTrue:[
+ (line isSingleByteString) ifTrue:[
thisLen := font widthOf:line
] ifFalse:[
thisLen := line widthOn:self
@@ -3292,7 +3292,7 @@
line := self visibleAt:visLineNr.
(fontIsFixedWidth
- and:[line isNil or:[line isMemberOf:String]])
+ and:[line isNil or:[line isSingleByteString]])
ifTrue:[
lText := (tcol * fontWidth)
] ifFalse:[
@@ -3307,7 +3307,7 @@
(lineSize < col) ifTrue:[
lText := (line widthOn:self) + (fontWidth * (tcol - lineSize))
] ifFalse:[
- (line isMemberOf:String) ifTrue:[
+ (line isSingleByteString) ifTrue:[
lText := (font widthOf:line from:1 to:tcol)
] ifFalse:[
lText := line widthFrom:1 to:tcol on:self.
@@ -3631,7 +3631,7 @@
entry := list at:lineNr.
entry notNil ifTrue:[
- (entry isMemberOf:String) ifTrue:[
+ (entry isSingleByteString) ifTrue:[
w := f widthOf:entry
] ifFalse:[
w := entry widthOn:self
@@ -3648,7 +3648,7 @@
line := list at:lineNr.
line notNil ifTrue:[
- (line isMemberOf:String) ifTrue:[
+ (line isSingleByteString) ifTrue:[
line size > lengthOfLongestString ifTrue:[
lengthOfLongestString := line size
].
@@ -3700,7 +3700,7 @@
].
f := font := font onDevice:d.
- (line isMemberOf:String) ifTrue:[
+ (line isSingleByteString) ifTrue:[
^ f widthOf:line
].
^ line widthOn:self
@@ -5307,10 +5307,10 @@
!ListView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.398 2014-07-06 12:43:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.399 2014-07-12 05:39:50 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.398 2014-07-06 12:43:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.399 2014-07-12 05:39:50 cg Exp $'
! !