--- a/WindowEvent.st	Tue Sep 05 14:12:13 2000 +0200
+++ b/WindowEvent.st	Tue Sep 05 20:29:50 2000 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+"{ Package: 'stx:libview' }"
+
 Object subclass:#WindowEvent
 	instanceVariableNames:'view type arguments delegatedFrom consumed'
 	classVariableNames:''
@@ -24,15 +26,8 @@
 	privateIn:WindowEvent
 !
 
-WindowEvent::InputEvent subclass:#KeyboardEvent
-	instanceVariableNames:'rawKey'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:WindowEvent
-!
-
-WindowEvent::InputEvent subclass:#FocusEvent
-	instanceVariableNames:''
+WindowEvent subclass:#ClientEvent
+	instanceVariableNames:'eventData'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:WindowEvent
@@ -45,8 +40,22 @@
 	privateIn:WindowEvent
 !
 
-WindowEvent subclass:#ClientEvent
-	instanceVariableNames:'eventData'
+WindowEvent subclass:#UserEvent
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:WindowEvent
+!
+
+WindowEvent::InputEvent subclass:#KeyboardEvent
+	instanceVariableNames:'rawKey'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:WindowEvent
+!
+
+WindowEvent::InputEvent subclass:#FocusEvent
+	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:WindowEvent
@@ -224,6 +233,12 @@
 
     "Created: / 4.4.1997 / 13:41:44 / cg"
     "Modified: / 6.6.1998 / 21:00:50 / cg"
+!
+
+userEvent
+    "return the class used to represent userEvents"
+
+    ^ UserEvent
 ! !
 
 !WindowEvent methodsFor:'accessing'!
@@ -711,6 +726,109 @@
     "Created: / 21.5.1999 / 19:49:30 / cg"
 ! !
 
+!WindowEvent::ClientEvent methodsFor:'accessing'!
+
+eventData
+    "return the value of the instance variable 'eventData' (automatically generated)"
+
+    ^ eventData
+
+    "Created: 4.4.1997 / 17:41:50 / cg"
+!
+
+eventData:something
+    "set the value of the instance variable 'eventData' (automatically generated)"
+
+    eventData := something.
+
+    "Created: 4.4.1997 / 17:41:57 / cg"
+! !
+
+!WindowEvent::ButtonEvent methodsFor:'accessing'!
+
+button
+    "return the button nr of the button-event"
+
+    ^ arguments at:1
+!
+
+state
+    "return the button state of the button-event
+     (mouse button bits at the time of the event)."
+
+    ^ arguments at:1
+
+    "Created: / 12.11.1998 / 16:21:18 / cg"
+!
+
+x
+    "return the x coordinate of the button-event
+     (mouse position at the time of the event)."
+
+    ^ arguments at:2
+
+    "Created: 1.8.1997 / 13:58:15 / cg"
+!
+
+x:anInteger
+    "change the x coordinate of the button-event"
+
+    ^ arguments at:2 put:anInteger
+
+    "Created: 1.8.1997 / 13:58:15 / cg"
+!
+
+y
+    "return the y coordinate of the button-event
+     (mouse position at the time of the event)."
+
+    ^ arguments at:3
+
+    "Created: 1.8.1997 / 13:58:07 / cg"
+!
+
+y:anInteger
+    "change the y coordinate of the button-event"
+
+    ^ arguments at:3 put:anInteger
+
+    "Created: 1.8.1997 / 13:58:15 / cg"
+! !
+
+!WindowEvent::ButtonEvent methodsFor:'queries'!
+
+isButtonEvent
+    "return true, if this event is a button event"
+
+    ^ true
+
+    "Created: 4.4.1997 / 13:44:11 / cg"
+!
+
+isButtonMotionEvent
+    "return true, if this event is a buttonMotion event"
+
+    ^ (type == #buttonMotion:x:y:)
+
+    "Created: 4.4.1997 / 13:44:22 / cg"
+!
+
+isButtonPressEvent
+    "return true, if this event is a buttonPress event"
+
+    ^ (type == #buttonPress:x:y:)
+
+    "Created: 4.4.1997 / 13:44:22 / cg"
+!
+
+isButtonReleaseEvent
+    "return true, if this event is a buttonRelease event"
+
+    ^ (type == #buttonRelease:x:y:)
+
+    "Created: 4.4.1997 / 13:44:22 / cg"
+! !
+
 !WindowEvent::KeyboardEvent methodsFor:'accessing'!
 
 key
@@ -819,111 +937,8 @@
     "Created: / 21.5.1999 / 19:45:04 / cg"
 ! !
 
-!WindowEvent::ButtonEvent methodsFor:'accessing'!
-
-button
-    "return the button nr of the button-event"
-
-    ^ arguments at:1
-!
-
-state
-    "return the button state of the button-event
-     (mouse button bits at the time of the event)."
-
-    ^ arguments at:1
-
-    "Created: / 12.11.1998 / 16:21:18 / cg"
-!
-
-x
-    "return the x coordinate of the button-event
-     (mouse position at the time of the event)."
-
-    ^ arguments at:2
-
-    "Created: 1.8.1997 / 13:58:15 / cg"
-!
-
-x:anInteger
-    "change the x coordinate of the button-event"
-
-    ^ arguments at:2 put:anInteger
-
-    "Created: 1.8.1997 / 13:58:15 / cg"
-!
-
-y
-    "return the y coordinate of the button-event
-     (mouse position at the time of the event)."
-
-    ^ arguments at:3
-
-    "Created: 1.8.1997 / 13:58:07 / cg"
-!
-
-y:anInteger
-    "change the y coordinate of the button-event"
-
-    ^ arguments at:3 put:anInteger
-
-    "Created: 1.8.1997 / 13:58:15 / cg"
-! !
-
-!WindowEvent::ButtonEvent methodsFor:'queries'!
-
-isButtonEvent
-    "return true, if this event is a button event"
-
-    ^ true
-
-    "Created: 4.4.1997 / 13:44:11 / cg"
-!
-
-isButtonMotionEvent
-    "return true, if this event is a buttonMotion event"
-
-    ^ (type == #buttonMotion:x:y:)
-
-    "Created: 4.4.1997 / 13:44:22 / cg"
-!
-
-isButtonPressEvent
-    "return true, if this event is a buttonPress event"
-
-    ^ (type == #buttonPress:x:y:)
-
-    "Created: 4.4.1997 / 13:44:22 / cg"
-!
-
-isButtonReleaseEvent
-    "return true, if this event is a buttonRelease event"
-
-    ^ (type == #buttonRelease:x:y:)
-
-    "Created: 4.4.1997 / 13:44:22 / cg"
-! !
-
-!WindowEvent::ClientEvent methodsFor:'accessing'!
-
-eventData
-    "return the value of the instance variable 'eventData' (automatically generated)"
-
-    ^ eventData
-
-    "Created: 4.4.1997 / 17:41:50 / cg"
-!
-
-eventData:something
-    "set the value of the instance variable 'eventData' (automatically generated)"
-
-    eventData := something.
-
-    "Created: 4.4.1997 / 17:41:57 / cg"
-! !
-
 !WindowEvent class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.65 2000-01-17 10:32:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.66 2000-09-05 18:29:50 cg Exp $'
 ! !