--- a/PullDMenu.st Sat May 25 13:34:53 1996 +0200
+++ b/PullDMenu.st Sat May 25 14:23:18 1996 +0200
@@ -824,39 +824,41 @@
state == 0 ifTrue:[^ self].
activeMenuNumber notNil ifTrue:[
- activeMenu := menus at:activeMenuNumber.
+ activeMenu := menus at:activeMenuNumber.
].
(y < height) ifTrue:[
- "moving around in title line"
- activeMenu notNil ifTrue:[
- activeMenu selection:nil
- ].
- titleIndex := self titleIndexForX:x.
- titleIndex notNil ifTrue:[
- (titleIndex ~~ activeMenuNumber) ifTrue:[
- self pullMenu:titleIndex
- ]
- ] ifFalse:[
- self hideActiveMenu
- ]
+ "moving around in title line"
+ activeMenu notNil ifTrue:[
+ activeMenu setSelection:nil
+ ].
+ titleIndex := self titleIndexForX:x.
+ titleIndex notNil ifTrue:[
+ (titleIndex ~~ activeMenuNumber) ifTrue:[
+ self pullMenu:titleIndex
+ ]
+ ] ifFalse:[
+ self hideActiveMenu
+ ]
] ifFalse:[
- "moving around below"
- activeMenu isNil ifTrue:[^self].
- activeLeft := activeMenu left.
- (x between:activeLeft and:(activeMenu right)) ifTrue:[
- activeTop := activeMenu top.
- (y between:activeTop and:(activeMenu bottom)) ifTrue:[
- "moving around in menu"
- activeMenu buttonMotion:state
- x:(x - activeLeft)
- y:(y - activeTop).
- ^ self
- ]
- ].
- "moved outside menu"
- activeMenu selection:nil
+ "moving around below"
+ activeMenu isNil ifTrue:[^self].
+ activeLeft := activeMenu left.
+ (x between:activeLeft and:(activeMenu right)) ifTrue:[
+ activeTop := activeMenu top.
+ (y between:activeTop and:(activeMenu bottom)) ifTrue:[
+ "moving around in menu"
+ activeMenu buttonMotion:state
+ x:(x - activeLeft)
+ y:(y - activeTop).
+ ^ self
+ ]
+ ].
+ "moved outside menu"
+ activeMenu setSelection:nil
]
+
+ "Modified: 25.5.1996 / 12:28:32 / cg"
!
buttonPress:button x:x y:y
@@ -1112,7 +1114,7 @@
@
(posY := height + subMenu borderWidth)).
subMenu hiddenOnRealize:false.
- subMenu deselect.
+ subMenu setSelection:nil.
subMenu create.
subMenu saveUnder:true.
subMenu superMenu:self.
@@ -1123,12 +1125,12 @@
subMenu raise show.
(styleSheet at:#pullDownMenuAutoselectFirst) == true ifTrue:[
- subMenu selection:1
+ subMenu setSelection:1
]
].
^ subMenu
- "Modified: 12.5.1996 / 16:38:10 / cg"
+ "Modified: 25.5.1996 / 13:02:58 / cg"
!
regainControl
@@ -1521,5 +1523,5 @@
!PullDownMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.54 1996-05-22 11:25:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.55 1996-05-25 12:22:55 cg Exp $'
! !