fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / wxPython / src / gtk / wx.py

diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index 0b1c4103e031d07d5509bc14ac2bc3bc5dd1cbed..8f91e297485a18d41dc9d2c135a68fbfc30b0723 100644 (file)
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -61,7 +61,6 @@ class wxPyAppPtr(wxEvtHandlerPtr):
         return val
     def GetTopWindow(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def GetVendorName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs)
@@ -194,6 +193,7 @@ wxRESIZE_BOX = wxc.wxRESIZE_BOX
 wxRESIZE_BORDER = wxc.wxRESIZE_BORDER
 wxDIALOG_MODAL = wxc.wxDIALOG_MODAL
 wxDIALOG_MODELESS = wxc.wxDIALOG_MODELESS
+wxDIALOG_NO_PARENT = wxc.wxDIALOG_NO_PARENT
 wxDEFAULT_FRAME_STYLE = wxc.wxDEFAULT_FRAME_STYLE
 wxDEFAULT_DIALOG_STYLE = wxc.wxDEFAULT_DIALOG_STYLE
 wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW
@@ -207,6 +207,7 @@ wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT
 wxED_STATIC_LINE = wxc.wxED_STATIC_LINE
 wxEXT_DIALOG_STYLE = wxc.wxEXT_DIALOG_STYLE
 wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN
+wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS
 wxRETAINED = wxc.wxRETAINED
 wxBACKINGSTORE = wxc.wxBACKINGSTORE
 wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
@@ -281,25 +282,6 @@ wxTR_LINES_AT_ROOT = wxc.wxTR_LINES_AT_ROOT
 wxTR_MULTIPLE = wxc.wxTR_MULTIPLE
 wxTR_SINGLE = wxc.wxTR_SINGLE
 wxTR_HAS_VARIABLE_ROW_HEIGHT = wxc.wxTR_HAS_VARIABLE_ROW_HEIGHT
-wxLC_ICON = wxc.wxLC_ICON
-wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON
-wxLC_LIST = wxc.wxLC_LIST
-wxLC_REPORT = wxc.wxLC_REPORT
-wxLC_ALIGN_TOP = wxc.wxLC_ALIGN_TOP
-wxLC_ALIGN_LEFT = wxc.wxLC_ALIGN_LEFT
-wxLC_AUTOARRANGE = wxc.wxLC_AUTOARRANGE
-wxLC_USER_TEXT = wxc.wxLC_USER_TEXT
-wxLC_EDIT_LABELS = wxc.wxLC_EDIT_LABELS
-wxLC_NO_HEADER = wxc.wxLC_NO_HEADER
-wxLC_NO_SORT_HEADER = wxc.wxLC_NO_SORT_HEADER
-wxLC_SINGLE_SEL = wxc.wxLC_SINGLE_SEL
-wxLC_SORT_ASCENDING = wxc.wxLC_SORT_ASCENDING
-wxLC_SORT_DESCENDING = wxc.wxLC_SORT_DESCENDING
-wxLC_MASK_TYPE = wxc.wxLC_MASK_TYPE
-wxLC_MASK_ALIGN = wxc.wxLC_MASK_ALIGN
-wxLC_MASK_SORT = wxc.wxLC_MASK_SORT
-wxLC_HRULES = wxc.wxLC_HRULES
-wxLC_VRULES = wxc.wxLC_VRULES
 wxSP_VERTICAL = wxc.wxSP_VERTICAL
 wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
 wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
@@ -378,6 +360,8 @@ wxID_COPY = wxc.wxID_COPY
 wxID_PASTE = wxc.wxID_PASTE
 wxID_CLEAR = wxc.wxID_CLEAR
 wxID_FIND = wxc.wxID_FIND
+wxID_DUPLICATE = wxc.wxID_DUPLICATE
+wxID_SELECTALL = wxc.wxID_SELECTALL
 wxID_FILE1 = wxc.wxID_FILE1
 wxID_FILE2 = wxc.wxID_FILE2
 wxID_FILE3 = wxc.wxID_FILE3
@@ -437,6 +421,7 @@ wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
 wxNB_LEFT = wxc.wxNB_LEFT
 wxNB_RIGHT = wxc.wxNB_RIGHT
 wxNB_BOTTOM = wxc.wxNB_BOTTOM
+wxNB_MULTILINE = wxc.wxNB_MULTILINE
 wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
 wxLI_VERTICAL = wxc.wxLI_VERTICAL
 wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER
@@ -813,6 +798,8 @@ wxEVT_DRAW_ITEM = wxc.wxEVT_DRAW_ITEM
 wxEVT_MEASURE_ITEM = wxc.wxEVT_MEASURE_ITEM
 wxEVT_COMPARE_ITEM = wxc.wxEVT_COMPARE_ITEM
 wxEVT_INIT_DIALOG = wxc.wxEVT_INIT_DIALOG
+wxEVT_HELP = wxc.wxEVT_HELP
+wxEVT_DETAILED_HELP = wxc.wxEVT_DETAILED_HELP
 wxEVT_IDLE = wxc.wxEVT_IDLE
 wxEVT_UPDATE_UI = wxc.wxEVT_UPDATE_UI
 wxEVT_COMMAND_LEFT_CLICK = wxc.wxEVT_COMMAND_LEFT_CLICK
@@ -1455,10 +1442,10 @@ def EVT_END_PROCESS(eh, id, 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):
-    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)
@@ -1467,8 +1454,8 @@ 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_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)
 
@@ -1489,17 +1476,9 @@ class wxTimer(wxPyTimer):
             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.
 
 
 #----------------------------------------------------------------------
@@ -1538,11 +1517,14 @@ wxPyDefaultSize     = wxDefaultSize
 def wxPyTypeCast(obj, typeStr):
     if obj is None:
         return None
+    theClass = globals()[typeStr+"Ptr"]
+    typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
     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")
-    theClass = globals()[typeStr+"Ptr"]
     theObj = theClass(newPtr)
     if hasattr(obj, "this"):
         theObj.thisown = obj.thisown
@@ -1677,4 +1659,6 @@ class __wxPyCleanup:
         self.cleanup()
 
 __cleanMeUp = __wxPyCleanup()
+
+#----------------------------------------------------------------------------
 #----------------------------------------------------------------------------