# HG changeset patch # User Claus Gittinger # Date 934987158 -7200 # Node ID 55184833642acc846e2b3ddaf0d16a8e51302a50 # Parent 599825bed17627243aece4dc837189368a549d00 #on: -> #onDevice: diff -r 599825bed176 -r 55184833642a PopUpList.st --- a/PopUpList.st Wed Aug 18 16:31:38 1999 +0200 +++ b/PopUpList.st Wed Aug 18 16:39:18 1999 +0200 @@ -844,7 +844,7 @@ ] ifFalse:[ "hack: simulate logo change to longest menu entry" - font := font on:device. + font := font onDevice:device. longest := logo. logo isNil ifTrue:[ longestWidth := 0 @@ -1044,5 +1044,5 @@ !PopUpList class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.62 1999-06-10 16:17:13 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/PopUpList.st,v 1.63 1999-08-18 14:39:18 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a PullDMenu.st --- a/PullDMenu.st Wed Aug 18 16:31:38 1999 +0200 +++ b/PullDMenu.st Wed Aug 18 16:39:18 1999 +0200 @@ -639,17 +639,17 @@ titles := Array new:numberOfLabels. titleArray keysAndValuesDo:[:index :entry | - |e| + |e| - entry isImage ifTrue:[ - e := entry on:device - ] ifFalse:[ - e := entry printString - ]. - titles at:index put:e + entry isImage ifTrue:[ + e := entry onDevice:device + ] ifFalse:[ + e := entry printString + ]. + titles at:index put:e ]. shown ifTrue:[ - self invalidate "/ clear; redraw + self invalidate "/ clear; redraw ] "Modified: 29.5.1996 / 16:21:00 / cg" @@ -807,7 +807,7 @@ You should not use this method; instead leave the value as defined in the styleSheet." - bgColor := aColor on:device + bgColor := aColor onDevice:device ! font:aFont @@ -816,16 +816,16 @@ You should not use this method; instead leave the value as defined in the styleSheet. CAVEAT: with the addition of Text objects, - this method is going to be obsoleted by a textStyle - method, which allows specific control over - normalFont/boldFont/italicFont parameters." + this method is going to be obsoleted by a textStyle + method, which allows specific control over + normalFont/boldFont/italicFont parameters." aFont ~~ font ifTrue:[ - super font:(aFont on:device). - self height:(font height + (font descent * 2)). - shown ifTrue:[ - self setMenuOrigins - ] + super font:(aFont onDevice:device). + self height:(font height + (font descent * 2)). + shown ifTrue:[ + self setMenuOrigins + ] ] "Modified: 22.5.1996 / 12:37:04 / cg" @@ -836,7 +836,7 @@ You should not use this method; instead leave the value as defined in the styleSheet." - fgColor := aColor on:device + fgColor := aColor onDevice:device ! showSeparatingLines:aBoolean @@ -908,21 +908,21 @@ |y w x wSpace fg bg map| selected ifTrue:[ - fg := activeFgColor. - bg := activeBgColor + fg := activeFgColor. + bg := activeBgColor ] ifFalse:[ - fg := fgColor. - bg := bgColor + fg := fgColor. + bg := bgColor ]. wSpace := font widthOf:' '. x := x0. stringOrImage isString ifTrue:[ - y := ((height - (font height)) // 2) + (font ascent) "+ topMargin". - w := font widthOf:stringOrImage. + y := ((height - (font height)) // 2) + (font ascent) "+ topMargin". + w := font widthOf:stringOrImage. ] ifFalse:[ - y := ((height - stringOrImage height) // 2) max:0. - w := stringOrImage width + y := ((height - stringOrImage height) // 2) max:0. + w := stringOrImage width ]. w := w + (wSpace * 2). @@ -930,31 +930,31 @@ self fillRectangleX:x y:0 width:w height:height. self is3D ifTrue:[ - self drawEdgesForX:x y:0 - width:w - height:height - level:(selected ifTrue:[onLevel] ifFalse:[offLevel]) + self drawEdgesForX:x y:0 + width:w + height:height + level:(selected ifTrue:[onLevel] ifFalse:[offLevel]) ]. self paint:fg on:bg. x := x + wSpace. stringOrImage isString ifTrue:[ - self displayOpaqueString:stringOrImage x:x y:y + self displayOpaqueString:stringOrImage x:x y:y ] ifFalse:[ - stringOrImage isImageOrForm ifTrue:[ - stringOrImage depth == 1 ifTrue:[ - (map := stringOrImage colorMap) notNil ifTrue:[ - map at:1 put:((map at:1) on:device). - map at:2 put:((map at:2) on:device). + stringOrImage isImageOrForm ifTrue:[ + stringOrImage depth == 1 ifTrue:[ + (map := stringOrImage colorMap) notNil ifTrue:[ + map at:1 put:((map at:1) onDevice:device). + map at:2 put:((map at:2) onDevice:device). - self paint:(map at:2) on:(map at:1). - self displayOpaqueForm:stringOrImage x:x y:y. - ^ self - ] - ]. - self displayForm:stringOrImage x:x y:y - ] ifFalse:[ - stringOrImage displayOn:self x:x y:y - ] + self paint:(map at:2) on:(map at:1). + self displayOpaqueForm:stringOrImage x:x y:y. + ^ self + ] + ]. + self displayForm:stringOrImage x:x y:y + ] ifFalse:[ + stringOrImage displayOn:self x:x y:y + ] ] "Modified: 14.1.1997 / 00:06:07 / cg" @@ -1413,11 +1413,11 @@ super fetchDeviceResources. - bgColor notNil ifTrue:[bgColor := bgColor on:device]. - fgColor notNil ifTrue:[fgColor := fgColor on:device]. + bgColor notNil ifTrue:[bgColor := bgColor onDevice:device]. + fgColor notNil ifTrue:[fgColor := fgColor onDevice:device]. - activeBgColor notNil ifTrue:[activeBgColor := activeBgColor on:device]. - activeFgColor notNil ifTrue:[activeFgColor := activeFgColor on:device]. + activeBgColor notNil ifTrue:[activeBgColor := activeBgColor onDevice:device]. + activeFgColor notNil ifTrue:[activeFgColor := activeFgColor onDevice:device]. "Created: 13.1.1997 / 23:25:14 / cg" ! @@ -1441,7 +1441,7 @@ showSeparatingLines := DefaultSeparatingLines. "/ false. DefaultViewBackground notNil ifTrue:[ - viewBackground := DefaultViewBackground on:device + viewBackground := DefaultViewBackground onDevice:device ]. DefaultForegroundColor notNil ifTrue:[ @@ -1511,9 +1511,9 @@ initialize super initialize. - font := font on:device. + font := font onDevice:device. self origin:(0.0 @ 0.0) - extent:(1.0 @ self preferredExtent y) + extent:(1.0 @ self preferredExtent y) "/ extent:(1.0 @ (font height + (font descent * 2) + topMargin)). ! @@ -1791,5 +1791,5 @@ !PullDownMenu class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.86 1999-08-04 14:10:07 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.87 1999-08-18 14:38:30 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a PullDownMenu.st --- a/PullDownMenu.st Wed Aug 18 16:31:38 1999 +0200 +++ b/PullDownMenu.st Wed Aug 18 16:39:18 1999 +0200 @@ -639,17 +639,17 @@ titles := Array new:numberOfLabels. titleArray keysAndValuesDo:[:index :entry | - |e| + |e| - entry isImage ifTrue:[ - e := entry on:device - ] ifFalse:[ - e := entry printString - ]. - titles at:index put:e + entry isImage ifTrue:[ + e := entry onDevice:device + ] ifFalse:[ + e := entry printString + ]. + titles at:index put:e ]. shown ifTrue:[ - self invalidate "/ clear; redraw + self invalidate "/ clear; redraw ] "Modified: 29.5.1996 / 16:21:00 / cg" @@ -807,7 +807,7 @@ You should not use this method; instead leave the value as defined in the styleSheet." - bgColor := aColor on:device + bgColor := aColor onDevice:device ! font:aFont @@ -816,16 +816,16 @@ You should not use this method; instead leave the value as defined in the styleSheet. CAVEAT: with the addition of Text objects, - this method is going to be obsoleted by a textStyle - method, which allows specific control over - normalFont/boldFont/italicFont parameters." + this method is going to be obsoleted by a textStyle + method, which allows specific control over + normalFont/boldFont/italicFont parameters." aFont ~~ font ifTrue:[ - super font:(aFont on:device). - self height:(font height + (font descent * 2)). - shown ifTrue:[ - self setMenuOrigins - ] + super font:(aFont onDevice:device). + self height:(font height + (font descent * 2)). + shown ifTrue:[ + self setMenuOrigins + ] ] "Modified: 22.5.1996 / 12:37:04 / cg" @@ -836,7 +836,7 @@ You should not use this method; instead leave the value as defined in the styleSheet." - fgColor := aColor on:device + fgColor := aColor onDevice:device ! showSeparatingLines:aBoolean @@ -908,21 +908,21 @@ |y w x wSpace fg bg map| selected ifTrue:[ - fg := activeFgColor. - bg := activeBgColor + fg := activeFgColor. + bg := activeBgColor ] ifFalse:[ - fg := fgColor. - bg := bgColor + fg := fgColor. + bg := bgColor ]. wSpace := font widthOf:' '. x := x0. stringOrImage isString ifTrue:[ - y := ((height - (font height)) // 2) + (font ascent) "+ topMargin". - w := font widthOf:stringOrImage. + y := ((height - (font height)) // 2) + (font ascent) "+ topMargin". + w := font widthOf:stringOrImage. ] ifFalse:[ - y := ((height - stringOrImage height) // 2) max:0. - w := stringOrImage width + y := ((height - stringOrImage height) // 2) max:0. + w := stringOrImage width ]. w := w + (wSpace * 2). @@ -930,31 +930,31 @@ self fillRectangleX:x y:0 width:w height:height. self is3D ifTrue:[ - self drawEdgesForX:x y:0 - width:w - height:height - level:(selected ifTrue:[onLevel] ifFalse:[offLevel]) + self drawEdgesForX:x y:0 + width:w + height:height + level:(selected ifTrue:[onLevel] ifFalse:[offLevel]) ]. self paint:fg on:bg. x := x + wSpace. stringOrImage isString ifTrue:[ - self displayOpaqueString:stringOrImage x:x y:y + self displayOpaqueString:stringOrImage x:x y:y ] ifFalse:[ - stringOrImage isImageOrForm ifTrue:[ - stringOrImage depth == 1 ifTrue:[ - (map := stringOrImage colorMap) notNil ifTrue:[ - map at:1 put:((map at:1) on:device). - map at:2 put:((map at:2) on:device). + stringOrImage isImageOrForm ifTrue:[ + stringOrImage depth == 1 ifTrue:[ + (map := stringOrImage colorMap) notNil ifTrue:[ + map at:1 put:((map at:1) onDevice:device). + map at:2 put:((map at:2) onDevice:device). - self paint:(map at:2) on:(map at:1). - self displayOpaqueForm:stringOrImage x:x y:y. - ^ self - ] - ]. - self displayForm:stringOrImage x:x y:y - ] ifFalse:[ - stringOrImage displayOn:self x:x y:y - ] + self paint:(map at:2) on:(map at:1). + self displayOpaqueForm:stringOrImage x:x y:y. + ^ self + ] + ]. + self displayForm:stringOrImage x:x y:y + ] ifFalse:[ + stringOrImage displayOn:self x:x y:y + ] ] "Modified: 14.1.1997 / 00:06:07 / cg" @@ -1413,11 +1413,11 @@ super fetchDeviceResources. - bgColor notNil ifTrue:[bgColor := bgColor on:device]. - fgColor notNil ifTrue:[fgColor := fgColor on:device]. + bgColor notNil ifTrue:[bgColor := bgColor onDevice:device]. + fgColor notNil ifTrue:[fgColor := fgColor onDevice:device]. - activeBgColor notNil ifTrue:[activeBgColor := activeBgColor on:device]. - activeFgColor notNil ifTrue:[activeFgColor := activeFgColor on:device]. + activeBgColor notNil ifTrue:[activeBgColor := activeBgColor onDevice:device]. + activeFgColor notNil ifTrue:[activeFgColor := activeFgColor onDevice:device]. "Created: 13.1.1997 / 23:25:14 / cg" ! @@ -1441,7 +1441,7 @@ showSeparatingLines := DefaultSeparatingLines. "/ false. DefaultViewBackground notNil ifTrue:[ - viewBackground := DefaultViewBackground on:device + viewBackground := DefaultViewBackground onDevice:device ]. DefaultForegroundColor notNil ifTrue:[ @@ -1511,9 +1511,9 @@ initialize super initialize. - font := font on:device. + font := font onDevice:device. self origin:(0.0 @ 0.0) - extent:(1.0 @ self preferredExtent y) + extent:(1.0 @ self preferredExtent y) "/ extent:(1.0 @ (font height + (font descent * 2) + topMargin)). ! @@ -1791,5 +1791,5 @@ !PullDownMenu class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.86 1999-08-04 14:10:07 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.87 1999-08-18 14:38:30 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a ScrollBar.st --- a/ScrollBar.st Wed Aug 18 16:31:38 1999 +0200 +++ b/ScrollBar.st Wed Aug 18 16:39:18 1999 +0200 @@ -813,7 +813,7 @@ style := styleSheet name. ((style = #iris) and:[Screen current hasGrayscales]) ifTrue:[ "have to change some of Buttons defaults" - clr := (Color gray:25) on:device. + clr := (Color gray:25) onDevice:device. button1 passiveLevel:2. button2 passiveLevel:2. button1 foregroundColor:clr. @@ -1077,5 +1077,5 @@ !ScrollBar class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.63 1999-07-08 13:55:57 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.64 1999-08-18 14:37:37 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a Scroller.st --- a/Scroller.st Wed Aug 18 16:31:38 1999 +0200 +++ b/Scroller.st Wed Aug 18 16:39:18 1999 +0200 @@ -557,7 +557,7 @@ ] ifFalse:[ nBg := DefaultViewBackground ]. - nBg := nBg on:device. + nBg := nBg onDevice:device. nBg ~~ viewBackground ifTrue:[ self viewBackground:nBg. shown ifTrue:[self clear]. @@ -785,51 +785,51 @@ newHeight := heightNumber / (range abs / 100). (newHeight > 100) ifTrue:[ - realNewHeight := 100 + realNewHeight := 100 ] ifFalse:[ - realNewHeight := newHeight + realNewHeight := newHeight ]. ((newOrigin + realNewHeight) > 100) ifTrue:[ - realNewOrigin := 100 - realNewHeight + realNewOrigin := 100 - realNewHeight ] ifFalse: [ - realNewOrigin := newOrigin + realNewOrigin := newOrigin ]. (realNewOrigin < 0) ifTrue: [ - realNewOrigin := 0 + realNewOrigin := 0 ]. changed := (realNewHeight ~= thumbHeight) or:[realNewOrigin ~= thumbOrigin]. (changed or:[thumbFrame isNil]) ifTrue:[ - old := self absFromPercent:thumbOrigin. - new := self absFromPercent:realNewOrigin. - changed := old ~~ new. - changed ifFalse:[ - old := self absFromPercent:thumbHeight. - new := self absFromPercent:realNewHeight. - changed := (old ~~ new) - ]. - (changed or:[thumbFrame isNil]) ifTrue:[ - thumbOrigin := realNewOrigin. - thumbHeight := realNewHeight. - - (DefaultFullViewBackground notNil - and:[DefaultViewBackground notNil - and:[DefaultFullViewBackground ~~ DefaultViewBackground]]) ifTrue:[ - realNewHeight >= 100 ifTrue:[ - nBg := DefaultFullViewBackground. - ] ifFalse:[ - nBg := DefaultViewBackground - ]. - nBg := nBg on:device. - nBg ~~ viewBackground ifTrue:[ - self viewBackground:nBg. - shown ifTrue:[self clear]. - ] - ]. - - shown ifTrue:[ - thumbFrame := nil. - self invalidate. + old := self absFromPercent:thumbOrigin. + new := self absFromPercent:realNewOrigin. + changed := old ~~ new. + changed ifFalse:[ + old := self absFromPercent:thumbHeight. + new := self absFromPercent:realNewHeight. + changed := (old ~~ new) + ]. + (changed or:[thumbFrame isNil]) ifTrue:[ + thumbOrigin := realNewOrigin. + thumbHeight := realNewHeight. + + (DefaultFullViewBackground notNil + and:[DefaultViewBackground notNil + and:[DefaultFullViewBackground ~~ DefaultViewBackground]]) ifTrue:[ + realNewHeight >= 100 ifTrue:[ + nBg := DefaultFullViewBackground. + ] ifFalse:[ + nBg := DefaultViewBackground + ]. + nBg := nBg onDevice:device. + nBg ~~ viewBackground ifTrue:[ + self viewBackground:nBg. + shown ifTrue:[self clear]. + ] + ]. + + shown ifTrue:[ + thumbFrame := nil. + self invalidate. "/ thumbFrame notNil ifTrue:[ "/ self drawThumbBackgroundInX:(thumbFrame left) @@ -839,10 +839,10 @@ "/ ]. "/ self computeThumbFrame. "/ self drawThumb - ] ifFalse:[ - thumbFrame := nil - ] - ] + ] ifFalse:[ + thumbFrame := nil + ] + ] ] "Modified: / 21.1.1998 / 19:32:41 / cg" @@ -982,13 +982,13 @@ |avgColor| - thumbColor := aColor on:device. + thumbColor := aColor onDevice:device. (styleSheet name ~~ #normal) ifTrue:[ avgColor := aColor averageColorIn:(0@0 corner:7@7). - thumbShadowColor := avgColor darkened on:device. - thumbLightColor := avgColor lightened on:device. - thumbHalfShadowColor := thumbShadowColor darkened on:device. - thumbHalfLightColor := thumbLightColor lightened on:device. + thumbShadowColor := avgColor darkened onDevice:device. + thumbLightColor := avgColor lightened onDevice:device. + thumbHalfShadowColor := thumbShadowColor darkened onDevice:device. + thumbHalfLightColor := thumbLightColor lightened onDevice:device. ]. self invalidate @@ -1012,14 +1012,14 @@ !Scroller methodsFor:'drawing'! drawHandleFormAtX:x y:y - thumbShadowColor := thumbShadowColor on:device. + thumbShadowColor := thumbShadowColor onDevice:device. self paint:thumbShadowColor. self displayForm:shadowForm x:x y:y. lightForm notNil ifTrue:[ - thumbLightColor := thumbLightColor on:device. - self paint:thumbLightColor. - self displayForm:lightForm x:x y:y. + thumbLightColor := thumbLightColor onDevice:device. + self paint:thumbLightColor. + self displayForm:lightForm x:x y:y. ]. "Modified: / 19.5.1998 / 16:26:49 / cg" @@ -1829,14 +1829,14 @@ super fetchDeviceResources. - thumbShadowColor notNil ifTrue:[thumbShadowColor := thumbShadowColor on:device]. - thumbLightColor notNil ifTrue:[thumbLightColor := thumbLightColor on:device]. - thumbHalfShadowColor notNil ifTrue:[thumbHalfShadowColor := thumbHalfShadowColor on:device]. - thumbHalfLightColor notNil ifTrue:[thumbHalfLightColor := thumbHalfLightColor on:device]. - - thumbEnteredColor notNil ifTrue:[thumbEnteredColor := thumbEnteredColor on:device]. - ghostColor notNil ifTrue:[ghostColor := ghostColor on:device]. - ghostFrameColor notNil ifTrue:[ghostFrameColor := ghostFrameColor on:device]. + thumbShadowColor notNil ifTrue:[thumbShadowColor := thumbShadowColor onDevice:device]. + thumbLightColor notNil ifTrue:[thumbLightColor := thumbLightColor onDevice:device]. + thumbHalfShadowColor notNil ifTrue:[thumbHalfShadowColor := thumbHalfShadowColor onDevice:device]. + thumbHalfLightColor notNil ifTrue:[thumbHalfLightColor := thumbHalfLightColor onDevice:device]. + + thumbEnteredColor notNil ifTrue:[thumbEnteredColor := thumbEnteredColor onDevice:device]. + ghostColor notNil ifTrue:[ghostColor := ghostColor onDevice:device]. + ghostFrameColor notNil ifTrue:[ghostFrameColor := ghostFrameColor onDevice:device]. "Modified: 13.1.1997 / 21:56:38 / cg" ! @@ -1944,7 +1944,7 @@ ]. ]. - thumbColor := thumbColor on:device. + thumbColor := thumbColor onDevice:device. thumbShadowColor notNil ifTrue:[ thumbShadowColor := thumbShadowColor onDevice:device. ]. @@ -2402,5 +2402,5 @@ !Scroller class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.134 1999-07-12 14:24:33 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.135 1999-08-18 14:37:19 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a SelListV.st --- a/SelListV.st Wed Aug 18 16:31:38 1999 +0200 +++ b/SelListV.st Wed Aug 18 16:39:18 1999 +0200 @@ -2525,10 +2525,10 @@ super fetchDeviceResources. - hilightFgColor notNil ifTrue:[hilightFgColor := hilightFgColor on:device]. - hilightBgColor notNil ifTrue:[hilightBgColor := hilightBgColor on:device]. - halfIntensityFgColor notNil ifTrue:[halfIntensityFgColor := halfIntensityFgColor on:device]. - hilightFrameColor notNil ifTrue:[hilightFrameColor := hilightFrameColor on:device]. + hilightFgColor notNil ifTrue:[hilightFgColor := hilightFgColor onDevice:device]. + hilightBgColor notNil ifTrue:[hilightBgColor := hilightBgColor onDevice:device]. + halfIntensityFgColor notNil ifTrue:[halfIntensityFgColor := halfIntensityFgColor onDevice:device]. + hilightFrameColor notNil ifTrue:[hilightFrameColor := hilightFrameColor onDevice:device]. "Created: 14.1.1997 / 00:11:13 / cg" ! @@ -3048,7 +3048,7 @@ (self line:listLine hasAttribute:#bold) ifTrue:[ newFont := font asBold. (font bold - or:[id := (newFont on:device) fontId. + or:[id := (newFont onDevice:device) fontId. id isNil]) ifTrue:[ " @@ -3615,5 +3615,5 @@ !SelectionInListView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Attic/SelListV.st,v 1.149 1999-07-26 08:43:18 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Attic/SelListV.st,v 1.150 1999-08-18 14:36:27 cg Exp $' ! ! diff -r 599825bed176 -r 55184833642a SelectionInListView.st --- a/SelectionInListView.st Wed Aug 18 16:31:38 1999 +0200 +++ b/SelectionInListView.st Wed Aug 18 16:39:18 1999 +0200 @@ -2525,10 +2525,10 @@ super fetchDeviceResources. - hilightFgColor notNil ifTrue:[hilightFgColor := hilightFgColor on:device]. - hilightBgColor notNil ifTrue:[hilightBgColor := hilightBgColor on:device]. - halfIntensityFgColor notNil ifTrue:[halfIntensityFgColor := halfIntensityFgColor on:device]. - hilightFrameColor notNil ifTrue:[hilightFrameColor := hilightFrameColor on:device]. + hilightFgColor notNil ifTrue:[hilightFgColor := hilightFgColor onDevice:device]. + hilightBgColor notNil ifTrue:[hilightBgColor := hilightBgColor onDevice:device]. + halfIntensityFgColor notNil ifTrue:[halfIntensityFgColor := halfIntensityFgColor onDevice:device]. + hilightFrameColor notNil ifTrue:[hilightFrameColor := hilightFrameColor onDevice:device]. "Created: 14.1.1997 / 00:11:13 / cg" ! @@ -3048,7 +3048,7 @@ (self line:listLine hasAttribute:#bold) ifTrue:[ newFont := font asBold. (font bold - or:[id := (newFont on:device) fontId. + or:[id := (newFont onDevice:device) fontId. id isNil]) ifTrue:[ " @@ -3615,5 +3615,5 @@ !SelectionInListView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.149 1999-07-26 08:43:18 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.150 1999-08-18 14:36:27 cg Exp $' ! !