--- a/Scroller.st Wed Dec 01 21:28:07 1999 +0100
+++ b/Scroller.st Wed Dec 01 21:29:16 1999 +0100
@@ -288,22 +288,24 @@
|f|
((aDisplay == Display) and:[HandleLightForm notNil]) ifTrue:[
- ^ HandleLightForm
+ ^ HandleLightForm
].
- f := Image fromFile:'bitmaps/HandleLight.xbm' resolution:100 on:aDisplay.
- f isNil ifTrue:[
- f := Form width:8 height:8 fromArray:#[2r00000000
- 2r00000010
- 2r00000011
- 2r00000011
- 2r00000011
- 2r00000011
- 2r00000110
- 2r00111100]
- on:aDisplay
+ f := Smalltalk bitmapFromFileNamed:'HandleLight.xbm' forClass:self.
+ f notNil ifTrue:[
+ f := f onDevice:aDisplay
+ ] ifFalse:[
+ f := Form width:8 height:8 fromArray:#[2r00000000
+ 2r00000010
+ 2r00000011
+ 2r00000011
+ 2r00000011
+ 2r00000011
+ 2r00000110
+ 2r00111100]
+ on:aDisplay
].
(aDisplay == Display) ifTrue:[
- HandleLightForm := f
+ HandleLightForm := f
].
^ f
@@ -317,22 +319,24 @@
|f|
((aDisplay == Display) and:[HandleShadowForm notNil]) ifTrue:[
- ^ HandleShadowForm
+ ^ HandleShadowForm
].
- f := Image fromFile:'bitmaps/HandleShadow.xbm' resolution:100 on:aDisplay.
- f isNil ifTrue:[
- f := Form width:8 height:8 fromArray:#[2r00111100
- 2r01100000
- 2r11000000
- 2r11000000
- 2r11000000
- 2r11000000
- 2r01000000
- 2r00000000]
- on:aDisplay
+ f := Smalltalk bitmapFromFileNamed:'HandleShadow.xbm' forClass:self.
+ f notNil ifTrue:[
+ f := f onDevice:aDisplay
+ ] ifFalse:[
+ f := Form width:8 height:8 fromArray:#[2r00111100
+ 2r01100000
+ 2r11000000
+ 2r11000000
+ 2r11000000
+ 2r11000000
+ 2r01000000
+ 2r00000000]
+ on:aDisplay
].
(aDisplay == Display) ifTrue:[
- HandleShadowForm := f
+ HandleShadowForm := f
].
^ f
@@ -2404,5 +2408,5 @@
!Scroller class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.137 1999-10-08 13:07:03 ah Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.138 1999-12-01 20:29:16 cg Exp $'
! !