Changeset 1554

Timestamp:

11/12/05 06:39:32 (3 years ago)

Author:

ed

Message:

Added some missing mouse events, including the Middle Button and wheel events.

Files:

• trunk/dabo/dEvents.py (modified) (2 diffs)
• trunk/dabo/ui/uiwx/dPemMixin.py (modified) (4 diffs)

trunk/dabo/dEvents.py

@@ -286 +286 @@
-    """Occurs when the mouse pointer leaves the form or control."""
-    pass
+
+class MouseMove(MouseEvent):
+    """Occurs when the mouse moves in the control."""
+    pass
+    
+class MouseWheel(MouseEvent):
+    """Occurs when the user scrolls the mouse wheel."""
+    pass
+    
+class MouseLeftDown(MouseEvent):
+    """Occurs when the mouse's left button is depressed on the control."""
+    pass
+    
+class MouseLeftUp(MouseEvent):
+    """Occurs when the mouse's left button is released on the control."""
+    pass
-    
-class MouseLeftClick(MouseEvent):
@@ -295 +311 @@
-    pass
-    
-
-
-
+
+
+
+
+
+
+
+
-class MouseRightClick(MouseEvent):
-    """Occurs when the mouse mouse's right button is depressed and released on the control."""
-    pass
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-class Paint(Event):

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -241 +241 @@
-        self.Bind(wx.EVT_LEFT_DOWN, self.__onWxMouseLeftDown)
-        self.Bind(wx.EVT_LEFT_UP, self.__onWxMouseLeftUp)
+        self.Bind(wx.EVT_LEFT_DCLICK, self.__onWxMouseLeftDoubleClick)
-        self.Bind(wx.EVT_RIGHT_DOWN, self.__onWxMouseRightDown)
-        self.Bind(wx.EVT_RIGHT_UP, self.__onWxMouseRightUp)
+        self.Bind(wx.EVT_RIGHT_DCLICK, self.__onWxMouseRightDoubleClick)
+        self.Bind(wx.EVT_MIDDLE_DOWN, self.__onWxMouseMiddleDown)
+        self.Bind(wx.EVT_MIDDLE_UP, self.__onWxMouseMiddleUp)
+        self.Bind(wx.EVT_MIDDLE_DCLICK, self.__onWxMouseMiddleDoubleClick)
-        self.Bind(wx.EVT_ENTER_WINDOW, self.__onWxMouseEnter)
-        self.Bind(wx.EVT_LEAVE_WINDOW, self.__onWxMouseLeave)
-        self.Bind(wx.EVT_LEFT_DCLICK, self.__onWxMouseLeftDoubleClick)
-        self.Bind(wx.EVT_MOTION, self.__onWxMouseMove)
-
+
+
-        self.Bind(wx.EVT_CONTEXT_MENU, self.__onWxContextMenu)
-        
@@ -323 +328 @@
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
-    def __onWxMouseLeftDown(self, evt):
-        self.raiseEvent(dEvents.MouseLeftDown, evt)
@@ -340 +349 @@
-        
-
-Move
-Move
-
+LeftDoubleClick
+LeftDoubleClick
+
-
-    def __onWxMouseRightDown(self, evt):
@@ -356 +365 @@
-            self._mouseRightDown = False
-    
+
+    def __onWxMouseRightDoubleClick(self, evt):
+        self.raiseEvent(dEvents.MouseRightDoubleClick, evt)
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+    def __onWxMouseMiddleDown(self, evt):
+        self._mouseMiddleDown = True
+        self.raiseEvent(dEvents.MouseMiddleDown, evt)
+        
+
+    def __onWxMouseMiddleUp(self, evt):
+        self.raiseEvent(dEvents.MouseMiddleUp, evt)
+        if self._mouseMiddleDown:
+            # mouse went down and up in this control: send a click:
+            self.raiseEvent(dEvents.MouseMiddleClick, evt)
+            self._mouseMiddleDown = False
+    
+
+    def __onWxMouseMiddleDoubleClick(self, evt):
+        self.raiseEvent(dEvents.MouseMiddleDoubleClick, evt)
+    
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-
-    def __onWxContextMenu(self, evt):