.
authorclaus
Sat, 16 Sep 1995 01:52:06 +0200
changeset 161 a33764a0af35
parent 160 0f356ac274e0
child 162 1c68705a8903
.
PopUpMenu.st
PullDMenu.st
PullDownMenu.st
Scroller.st
VarPanelC.st
VariablePanelController.st
--- a/PopUpMenu.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/PopUpMenu.st	Sat Sep 16 01:52:06 1995 +0200
@@ -23,7 +23,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.24 1995-08-08 01:22:17 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.25 1995-09-15 23:51:37 claus Exp $
 '!
 
 !PopUpMenu class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.24 1995-08-08 01:22:17 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PopUpMenu.st,v 1.25 1995-09-15 23:51:37 claus Exp $
 "
 !
 
@@ -845,13 +845,15 @@
 
 !PopUpMenu methodsFor:'event handling'!
 
-buttonMotion:button x:x y:y
+buttonMotion:state x:x y:y
     |p superMenu|
 
+    state == 0 ifTrue:[^ self].
+
     ((x >= 0) and:[x < width]) ifTrue:[
 	((y >= 0) and:[y < height]) ifTrue:[
 	    hideOnRelease := true.
-	    menuView buttonMotion:button x:x y:y.
+	    menuView buttonMotion:state x:x y:y.
 	    ^ self
 	]
     ].
@@ -862,11 +864,11 @@
 	p := device translatePoint:(x @ y)
 			      from:drawableId
 				to:(menuView superMenu id).
-	superMenu buttonMotion:button x:p x y:p y
+	superMenu buttonMotion:state x:p x y:p y
     ].
 
     menuView subMenuShown isNil ifTrue:[
-	menuView pointerLeave:button.
+	menuView pointerLeave:state.
     ].
 
     hideOnLeave ifTrue:[
--- a/PullDMenu.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/PullDMenu.st	Sat Sep 16 01:52:06 1995 +0200
@@ -34,7 +34,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.23 1995-09-07 12:45:45 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.24 1995-09-15 23:51:41 claus Exp $
 '!
 
 !PullDownMenu class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.23 1995-09-07 12:45:45 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.24 1995-09-15 23:51:41 claus Exp $
 "
 !
 
@@ -1149,9 +1149,11 @@
     ]
 !
 
-buttonMotion:button x:x y:y
+buttonMotion:state x:x y:y
     |titleIndex activeMenu activeLeft activeTop|
 
+    state == 0 ifTrue:[^ self].
+
     activeMenuNumber notNil ifTrue:[
 	activeMenu := menus at:activeMenuNumber.
     ].
@@ -1177,7 +1179,7 @@
 	    activeTop := activeMenu top.
 	    (y between:activeTop and:(activeMenu bottom)) ifTrue:[
 		"moving around in menu"
-		activeMenu buttonMotion:button
+		activeMenu buttonMotion:state
 				      x:(x - activeLeft)
 				      y:(y - activeTop).
 		^ self
--- a/PullDownMenu.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/PullDownMenu.st	Sat Sep 16 01:52:06 1995 +0200
@@ -34,7 +34,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.23 1995-09-07 12:45:45 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.24 1995-09-15 23:51:41 claus Exp $
 '!
 
 !PullDownMenu class methodsFor:'documentation'!
@@ -55,7 +55,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.23 1995-09-07 12:45:45 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.24 1995-09-15 23:51:41 claus Exp $
 "
 !
 
@@ -1149,9 +1149,11 @@
     ]
 !
 
-buttonMotion:button x:x y:y
+buttonMotion:state x:x y:y
     |titleIndex activeMenu activeLeft activeTop|
 
+    state == 0 ifTrue:[^ self].
+
     activeMenuNumber notNil ifTrue:[
 	activeMenu := menus at:activeMenuNumber.
     ].
@@ -1177,7 +1179,7 @@
 	    activeTop := activeMenu top.
 	    (y between:activeTop and:(activeMenu bottom)) ifTrue:[
 		"moving around in menu"
-		activeMenu buttonMotion:button
+		activeMenu buttonMotion:state
 				      x:(x - activeLeft)
 				      y:(y - activeTop).
 		^ self
--- a/Scroller.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/Scroller.st	Sat Sep 16 01:52:06 1995 +0200
@@ -37,7 +37,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.27 1995-07-23 03:02:31 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.28 1995-09-15 23:51:50 claus Exp $
 '!
 
 !Scroller class methodsFor:'documentation'!
@@ -58,7 +58,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.27 1995-07-23 03:02:31 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.28 1995-09-15 23:51:50 claus Exp $
 "
 !
 
@@ -721,7 +721,7 @@
     ]
 !
 
-buttonMotion:button x:x y:y
+buttonMotion:state x:x y:y
     "mouse-button was moved while pressed;
      redraw thumb at its new position and, if scroll-mode is asynchronous, 
      the scroll action is performed"
--- a/VarPanelC.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/VarPanelC.st	Sat Sep 16 01:52:06 1995 +0200
@@ -47,13 +47,13 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/VarPanelC.st,v 1.4 1995-08-29 16:44:40 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/VarPanelC.st,v 1.5 1995-09-15 23:52:06 claus Exp $
 "
 ! !
 
 !VariablePanelController methodsFor:'event handling'!
 
-buttonMotion:button x:bx y:by
+buttonMotion:state x:bx y:by
     "mouse-button was moved while pressed;
      clear prev handleBar and draw handle bar at new position" 
 
--- a/VariablePanelController.st	Thu Sep 14 19:44:12 1995 +0200
+++ b/VariablePanelController.st	Sat Sep 16 01:52:06 1995 +0200
@@ -47,13 +47,13 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/VariablePanelController.st,v 1.4 1995-08-29 16:44:40 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariablePanelController.st,v 1.5 1995-09-15 23:52:06 claus Exp $
 "
 ! !
 
 !VariablePanelController methodsFor:'event handling'!
 
-buttonMotion:button x:bx y:by
+buttonMotion:state x:bx y:by
     "mouse-button was moved while pressed;
      clear prev handleBar and draw handle bar at new position"