--- a/PullDownMenu.st Sat Apr 02 17:10:57 2016 +0200
+++ b/PullDownMenu.st Sat Apr 02 17:10:58 2016 +0200
@@ -11,6 +11,8 @@
"
"{ Package: 'stx:libwidg' }"
+"{ NameSpace: Smalltalk }"
+
View subclass:#PullDownMenu
instanceVariableNames:'receiver menus titles selectors activeMenuNumber
showSeparatingLines topMargin fgColor bgColor activeFgColor
@@ -645,7 +647,7 @@
|e|
entry isImage ifTrue:[
- e := entry onDevice:self graphicsDevice
+ e := entry onDevice:device
] ifFalse:[
e := entry printString
].
@@ -820,7 +822,7 @@
You should not use this method; instead leave the value as
defined in the styleSheet."
- bgColor := aColor onDevice:self graphicsDevice
+ bgColor := aColor onDevice:device
!
font:aFont
@@ -853,7 +855,7 @@
You should not use this method; instead leave the value as
defined in the styleSheet."
- fgColor := aColor onDevice:self graphicsDevice
+ fgColor := aColor onDevice:device
!
showSeparatingLines:aBoolean
@@ -959,8 +961,8 @@
stringOrImage isImageOrForm ifTrue:[
stringOrImage depth == 1 ifTrue:[
(map := stringOrImage colorMap) notNil ifTrue:[
- map at:1 put:((map at:1) onDevice:self graphicsDevice).
- map at:2 put:((map at:2) onDevice:self graphicsDevice).
+ 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.
@@ -1437,11 +1439,11 @@
super fetchDeviceResources.
- bgColor notNil ifTrue:[bgColor := bgColor onDevice:self graphicsDevice].
- fgColor notNil ifTrue:[fgColor := fgColor onDevice:self graphicsDevice].
+ bgColor notNil ifTrue:[bgColor := bgColor onDevice:device].
+ fgColor notNil ifTrue:[fgColor := fgColor onDevice:device].
- activeBgColor notNil ifTrue:[activeBgColor := activeBgColor onDevice:self graphicsDevice].
- activeFgColor notNil ifTrue:[activeFgColor := activeFgColor onDevice:self graphicsDevice].
+ activeBgColor notNil ifTrue:[activeBgColor := activeBgColor onDevice:device].
+ activeFgColor notNil ifTrue:[activeFgColor := activeFgColor onDevice:device].
"Created: 13.1.1997 / 23:25:14 / cg"
!
@@ -1465,7 +1467,7 @@
showSeparatingLines := DefaultSeparatingLines. "/ false.
DefaultViewBackground notNil ifTrue:[
- viewBackground := DefaultViewBackground onDevice:self graphicsDevice
+ viewBackground := DefaultViewBackground onDevice:device
].
DefaultForegroundColor notNil ifTrue:[
@@ -1482,12 +1484,12 @@
offLevel := DefaultLevel.
self is3D ifTrue:[
- self graphicsDevice hasColors ifTrue:[
+ device hasColors ifTrue:[
activeFgColor := Color name:'yellow'
] ifFalse:[
activeFgColor := White
].
- self graphicsDevice hasGrayscales ifTrue:[
+ device hasGrayscales ifTrue:[
activeBgColor := bgColor.
] ifFalse:[
activeBgColor := fgColor.
@@ -1637,7 +1639,7 @@
setMenuOrigins
"adjust origins of menus when font changes"
- (gc font graphicsDevice == self graphicsDevice) ifTrue:[
+ (gc font graphicsDevice == device) ifTrue:[
menus notNil ifTrue:[
menus keysAndValuesDo:[:index :aMenu |
aMenu notNil ifTrue:[
@@ -1822,10 +1824,10 @@
!PullDownMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.110 2014-03-19 13:33:28 stefan Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.110 2014-03-19 13:33:28 stefan Exp $'
+ ^ '$Header$'
! !