forgotten method declaration

[wxWidgets.git] / wxPython / src / _extras.py

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index f8698fb0501f5752d6c9fe78cae74dd37e647d3a..ba7f0c2b3595e78192267a723e9d82495ddc908b 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -169,6 +169,8 @@ def EVT_LEAVE_WINDOW(win, func):
 def EVT_ENTER_WINDOW(win, func):
     win.Connect(-1, -1, wxEVT_ENTER_WINDOW, func)
 
 def EVT_ENTER_WINDOW(win, func):
     win.Connect(-1, -1, wxEVT_ENTER_WINDOW, func)
 

+def EVT_MOUSEWHEEL(win, func):
+    win.Connect(-1, -1, wxEVT_MOUSEWHEEL, func)

 
 # all mouse events
 def EVT_MOUSE_EVENTS(win, func):
 
 # all mouse events
 def EVT_MOUSE_EVENTS(win, func):


@@ -443,6 +445,9 @@ def EVT_TREE_BEGIN_DRAG(win, id, func):
 def EVT_TREE_BEGIN_RDRAG(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
 
 def EVT_TREE_BEGIN_RDRAG(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
 

+def EVT_TREE_END_DRAG(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
+

 def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
 
 def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
     win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
 


@@ -616,10 +621,10 @@ def EVT_END_PROCESS(eh, id, func):
 
 # wxJoyStick
 def EVT_JOY_DOWN(win, func):
 
 # wxJoyStick
 def EVT_JOY_DOWN(win, func):

-    win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
+    win.Connect(-1, -1, wxEVT_JOY_BUTTON_DOWN, func)

 
 def EVT_JOY_UP(win, func):
 
 def EVT_JOY_UP(win, func):

-    win.Connect(-1, -1, wxEVT_JOY_UP, func)
+    win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)

 
 def EVT_JOY_MOVE(win, func):
     win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
 
 def EVT_JOY_MOVE(win, func):
     win.Connect(-1, -1, wxEVT_JOY_MOVE, func)


@@ -628,11 +633,16 @@ def EVT_JOY_ZMOVE(win, func):
     win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
 
 def EVT_JOYSTICK_EVENTS(win, func):
     win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
 
 def EVT_JOYSTICK_EVENTS(win, func):

-    win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
-    win.Connect(-1, -1, wxEVT_JOY_UP, func)
+    win.Connect(-1, -1, wxEVT_JOY_BUTTON_DOWN, func)
+    win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)

     win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
     win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
 
     win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
     win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
 

+
+def EVT_TOGGLEBUTTON(win, id, func):
+    win.Connect(id, -1, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, func)
+
+

 #----------------------------------------------------------------------
 
 class wxTimer(wxPyTimer):
 #----------------------------------------------------------------------
 
 class wxTimer(wxPyTimer):


@@ -645,17 +655,9 @@ class wxTimer(wxPyTimer):
             self.SetOwner(evtHandler, id)
 
 #----------------------------------------------------------------------
             self.SetOwner(evtHandler, id)
 
 #----------------------------------------------------------------------

-# Some wxWin methods can take "NULL" as parameters, but the shadow classes
-# expect an object with the SWIG pointer as a 'this' member.  This class
-# and instance fools the shadow into passing the NULL pointer.
-
-## NOTE:  This is not needed anymore as None can be passed instead and
-#         will be interpreted as NULL.

 
 

-class _NullObj:
-    this = 'NULL'       # SWIG converts this to (void*)0
-
-NULL = _NullObj()
+NULL = None  # For backwards compatibility only.  You should really be
+             # using None now.

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -694,11 +696,14 @@ wxPyDefaultSize     = wxDefaultSize
 def wxPyTypeCast(obj, typeStr):
     if obj is None:
         return None
 def wxPyTypeCast(obj, typeStr):
     if obj is None:
         return None

+    theClass = globals()[typeStr+"Ptr"]
+    typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)

     if hasattr(obj, "this"):
     if hasattr(obj, "this"):

+        if obj.__class__ is theClass:   # if already the right type then just return it
+            return obj

         newPtr = ptrcast(obj.this, typeStr+"_p")
     else:
         newPtr = ptrcast(obj, typeStr+"_p")
         newPtr = ptrcast(obj.this, typeStr+"_p")
     else:
         newPtr = ptrcast(obj, typeStr+"_p")

-    theClass = globals()[typeStr+"Ptr"]

     theObj = theClass(newPtr)
     if hasattr(obj, "this"):
         theObj.thisown = obj.thisown
     theObj = theClass(newPtr)
     if hasattr(obj, "this"):
         theObj.thisown = obj.thisown


@@ -833,4 +838,6 @@ class __wxPyCleanup:
         self.cleanup()
 
 __cleanMeUp = __wxPyCleanup()
         self.cleanup()
 
 __cleanMeUp = __wxPyCleanup()

+
+#----------------------------------------------------------------------------

 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------