--- a/ButtonController.st	Tue Jul 10 20:57:07 2001 +0200
+++ b/ButtonController.st	Fri Jul 20 14:18:31 2001 +0200
@@ -420,16 +420,16 @@
 
 !ButtonController methodsFor:'event handling'!
 
-buttonMotion:state x:x y:y
+buttonMotion:buttonState x:x y:y
     (x >= 0 and:[x < view width
     and:[y >= 0 and:[y < view height]]]) ifTrue:[
         entered ifFalse:[
-	    self pointerEnter:state x:x y:y
-	]
+            self pointerEnter:buttonState x:x y:y
+        ]
     ] ifFalse:[
         entered ifTrue:[
-	    self pointerLeave:state
-	]
+            self pointerLeave:buttonState
+        ]
     ]
 !
 
@@ -789,5 +789,5 @@
 !ButtonController class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.64 2001-02-08 16:24:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.65 2001-07-20 12:18:31 cg Exp $'
 ! !

--- a/CodeView.st	Tue Jul 10 20:57:07 2001 +0200
+++ b/CodeView.st	Fri Jul 20 14:18:31 2001 +0200
@@ -105,11 +105,11 @@
 
 !CodeView methodsFor:'event handling'!
 
-buttonMotion:state x:x y:y
+buttonMotion:buttonState x:x y:y
     |col line word|
 
     pointerOverWordAction notNil ifTrue:[
-        state == 0 ifTrue:[
+        buttonState == 0 ifTrue:[
             line := self visibleLineOfY:y.
             col := self colOfX:x inVisibleLine:line.
             line := self visibleLineToAbsoluteLine:line.
@@ -123,8 +123,7 @@
             ^ self
         ].
     ].
-    super buttonMotion:state x:x y:y
-
+    super buttonMotion:buttonState x:x y:y
 !
 
 keyPress:key x:x y:y
@@ -266,5 +265,5 @@
 !CodeView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.44 2000-10-20 11:07:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.45 2001-07-20 12:18:15 cg Exp $'
 ! !