--- a/WindowEvent.st	Fri May 08 15:23:32 2009 +0200
+++ b/WindowEvent.st	Sat May 09 07:09:22 2009 +0200
@@ -794,6 +794,20 @@
     "Created: 12.4.1997 / 11:30:59 / cg"
 !
 
+targetView
+    "return the view which will eventually handle the event;
+     for most events, this is the same as the view, for which the event was
+     originally generated.
+     Except, if an explicit focus has been assigned (i.e. tabbed into a component),
+     AND the event is a keyboard event. In this case, the targetView might be different.
+     Notice: this method might return nil, for synthetic (app-related) or display screen related
+     events"
+
+    ^ self view.
+! !
+
+!WindowEvent methodsFor:'testing'!
+
 isApplicationEvent
     "return true, if this event is application related (i.e. not for a particular view)"
 
@@ -1002,18 +1016,6 @@
     ^ false
 
     "Modified: 5.3.1997 / 11:27:40 / cg"
-!
-
-targetView
-    "return the view which will eventually handle the event;
-     for most events, this is the same as the view, for which the event was
-     originally generated.
-     Except, if an explicit focus has been assigned (i.e. tabbed into a component),
-     AND the event is a keyboard event. In this case, the targetView might be different.
-     Notice: this method might return nil, for synthetic (app-related) or display screen related
-     events"
-
-    ^ self view.
 ! !
 
 !WindowEvent::ApplicationEvent methodsFor:'blocked'!
@@ -1022,7 +1024,7 @@
     ^ nil
 ! !
 
-!WindowEvent::ApplicationEvent methodsFor:'queries'!
+!WindowEvent::ApplicationEvent methodsFor:'testing'!
 
 isApplicationEvent
     ^ true
@@ -1174,12 +1176,6 @@
     "Modified: 21.8.1997 / 19:41:34 / cg"
 !
 
-isInputEvent
-    ^ true
-
-    "Created: / 21.5.1999 / 19:49:30 / cg"
-!
-
 targetView
     "return the view which will eventually handle the event;
      for most events, this is the same as the view, for which the event was
@@ -1204,6 +1200,14 @@
     ^ evView
 ! !
 
+!WindowEvent::InputEvent methodsFor:'testing'!
+
+isInputEvent
+    ^ true
+
+    "Created: / 21.5.1999 / 19:49:30 / cg"
+! !
+
 !WindowEvent::ButtonEvent methodsFor:'accessing'!
 
 button
@@ -1255,7 +1259,7 @@
     "Created: 1.8.1997 / 13:58:15 / cg"
 ! !
 
-!WindowEvent::ButtonEvent methodsFor:'queries'!
+!WindowEvent::ButtonEvent methodsFor:'testing'!
 
 isButtonEvent
     "return true, if this event is a button event"
@@ -1265,7 +1269,7 @@
     "Created: 4.4.1997 / 13:44:11 / cg"
 ! !
 
-!WindowEvent::ButtonPressEvent methodsFor:'queries'!
+!WindowEvent::ButtonPressEvent methodsFor:'testing'!
 
 isButtonPressEvent
     "return true, if this event is a buttonPress event"
@@ -1273,7 +1277,7 @@
     ^ true
 ! !
 
-!WindowEvent::ButtonMultiPressEvent methodsFor:'queries'!
+!WindowEvent::ButtonMultiPressEvent methodsFor:'testing'!
 
 isButtonMultiPressEvent
     ^ true
@@ -1289,7 +1293,7 @@
     ^ false
 ! !
 
-!WindowEvent::ButtonReleaseEvent methodsFor:'queries'!
+!WindowEvent::ButtonReleaseEvent methodsFor:'testing'!
 
 isButtonReleaseEvent
     "return true, if this event is a buttonRelease event"
@@ -1315,13 +1319,13 @@
     "Created: 4.4.1997 / 17:41:57 / cg"
 ! !
 
-!WindowEvent::ConfigureEvent methodsFor:'queries'!
+!WindowEvent::ConfigureEvent methodsFor:'testing'!
 
 isConfigureEvent
     ^ true
 ! !
 
-!WindowEvent::DamageEvent methodsFor:'queries'!
+!WindowEvent::DamageEvent methodsFor:'testing'!
 
 isDamage
     "return true, if this is a damage event"
@@ -1352,7 +1356,7 @@
     ^ args at:3 ifAbsent:nil
 ! !
 
-!WindowEvent::EnterLeaveEvent methodsFor:'queries'!
+!WindowEvent::EnterLeaveEvent methodsFor:'testing'!
 
 isPointerEnterEvent
     "return true, if this event is a pointer-enter event"
@@ -1379,7 +1383,7 @@
     "Created: 9.1.1996 / 15:51:36 / cg"
 ! !
 
-!WindowEvent::FocusEvent methodsFor:'queries'!
+!WindowEvent::FocusEvent methodsFor:'testing'!
 
 isFocusEvent
     "return true, if this event is a focus event"
@@ -1405,7 +1409,7 @@
     "Created: / 21.5.1999 / 19:45:04 / cg"
 ! !
 
-!WindowEvent::ButtonMotionEvent methodsFor:'queries'!
+!WindowEvent::ButtonMotionEvent methodsFor:'testing'!
 
 isButtonMotionEvent
     "return true, if this event is a buttonMotion event"
@@ -1474,7 +1478,7 @@
     ^ args at:3 put:anInteger
 ! !
 
-!WindowEvent::KeyboardEvent methodsFor:'queries'!
+!WindowEvent::KeyboardEvent methodsFor:'testing'!
 
 isDelegatedToFocusView
     "return true, if this event will be forwarded to a focusView."
@@ -1490,7 +1494,7 @@
     "Created: 4.4.1997 / 13:39:59 / cg"
 ! !
 
-!WindowEvent::KeyReleaseEvent methodsFor:'queries'!
+!WindowEvent::KeyReleaseEvent methodsFor:'testing'!
 
 isKeyReleaseEvent
     "return true, if this event is a keyboard press event"
@@ -1498,7 +1502,7 @@
     ^ true
 ! !
 
-!WindowEvent::KeyPressEvent methodsFor:'queries'!
+!WindowEvent::KeyPressEvent methodsFor:'testing'!
 
 isKeyPressEvent
     "return true, if this event is a keyboard press event"
@@ -1513,7 +1517,7 @@
     ^ args at: 1
 ! !
 
-!WindowEvent::KeyboardFocusEvent methodsFor:'queries'!
+!WindowEvent::KeyboardFocusEvent methodsFor:'testing'!
 
 isKeyboardFocusEvent
     "return true, if this event is a keyboard focus event"
@@ -1527,7 +1531,7 @@
     ^ nil
 ! !
 
-!WindowEvent::MessageSendEvent methodsFor:'queries'!
+!WindowEvent::MessageSendEvent methodsFor:'testing'!
 
 isMessageSendEvent
     "return true, if this event is a general messageSend event"
@@ -1552,7 +1556,7 @@
     ^ args at:5
 ! !
 
-!WindowEvent::MouseWheelMotionEvent methodsFor:'queries'!
+!WindowEvent::MouseWheelMotionEvent methodsFor:'testing'!
 
 isDelegatedToFocusView
     "return true, if this event will be forwarded to a focusView."
@@ -1574,7 +1578,7 @@
     selector := something.
 ! !
 
-!WindowEvent::NewDamageEvent methodsFor:'queries'!
+!WindowEvent::NewDamageEvent methodsFor:'testing'!
 
 isDamage
     "return true, if this is a damage event"
@@ -1588,7 +1592,7 @@
     ^ (receiver == aView)
 ! !
 
-!WindowEvent::TerminateEvent methodsFor:'queries'!
+!WindowEvent::TerminateEvent methodsFor:'testing'!
 
 isTerminateEvent
     ^ true
@@ -1608,7 +1612,7 @@
     "Created: / 31-10-2007 / 01:23:07 / cg"
 ! !
 
-!WindowEvent::TrayActionEvent methodsFor:'queries'!
+!WindowEvent::TrayActionEvent methodsFor:'testing'!
 
 isTrayEvent
     ^ true
@@ -1616,7 +1620,7 @@
     "Created: / 09-11-2007 / 13:09:17 / cg"
 ! !
 
-!WindowEvent::WindowMapUnmapEvent methodsFor:'queries'!
+!WindowEvent::WindowMapUnmapEvent methodsFor:'testing'!
 
 isMapEvent
     "return true, if this is a map event"
@@ -1638,7 +1642,7 @@
 !WindowEvent class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.101 2009-02-25 11:31:22 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowEvent.st,v 1.102 2009-05-09 05:09:22 cg Exp $'
 ! !
 
 WindowEvent::InputEvent initialize!