--- a/MenuPanel.st Tue Dec 11 12:53:42 2001 +0100
+++ b/MenuPanel.st Wed Dec 12 10:43:09 2001 +0100
@@ -3419,34 +3419,33 @@
flyByHelpTextAt:srcPoint
"return the helpText for aPoint (i.e. when mouse-pointer is moved over an item).
- If there is a selection, that items helpText is used (ignoreing the given point).
+ If there is a selection, that items helpText is used (ignoring the given point).
"
|dstMenu dstPoint|
dstMenu := self detectMenuAtGrabPoint:srcPoint.
-
- dstMenu isNil ifTrue:[
- ^ ''
- ].
+ dstMenu isNil ifTrue:[^ nil].
dstPoint := dstMenu translateGrabPoint:srcPoint.
- ^ dstMenu flyByHelpTextForItem:(dstMenu itemAtX:(dstPoint x) y:(dstPoint y)).
+ ^ dstMenu flyByHelpTextForItem:(dstMenu itemAtX:(dstPoint x) y:(dstPoint y)).
!
flyByHelpTextForItem:anItem
"returns the helpText for an item (empty if none)
"
- |key val app|
-
- anItem isNil ifTrue:[^ ''].
-
- ( (key := anItem activeHelpKey) notNil
- and:[(app := self application) notNil]
- ) ifTrue:[
- val := app flyByHelpTextForKey:key.
- ].
-
- ^ val
+ |key app|
+
+ anItem isNil ifTrue:[^ nil].
+
+ anItem isButton ifFalse:[^ nil].
+
+ key := anItem activeHelpKey.
+ key isNil ifTrue:[^ nil].
+
+ app := self application.
+ app isNil ifTrue:[^ nil].
+
+ ^ app flyByHelpTextForKey:key.
!
helpText
@@ -7004,6 +7003,6 @@
!MenuPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.292 2001-12-11 11:53:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.293 2001-12-12 09:43:09 cg Exp $'
! !
MenuPanel initialize!