X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d26dc89c5e7a421f4f8807728928eee91aa5f7e..f8305cafb5a59cb2fa7bedc6e8e20e4bada60d90:/wxPython/src/msw/wx.py

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 55d3282d8e..ae2194e9f7 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -288,8 +288,13 @@ wxSB_HORIZONTAL = wxc.wxSB_HORIZONTAL
 wxSB_VERTICAL = wxc.wxSB_VERTICAL
 wxST_SIZEGRIP = wxc.wxST_SIZEGRIP
 wxST_NO_AUTORESIZE = wxc.wxST_NO_AUTORESIZE
-wxBU_AUTODRAW = wxc.wxBU_AUTODRAW
 wxBU_NOAUTODRAW = wxc.wxBU_NOAUTODRAW
+wxBU_AUTODRAW = wxc.wxBU_AUTODRAW
+wxBU_LEFT = wxc.wxBU_LEFT
+wxBU_TOP = wxc.wxBU_TOP
+wxBU_RIGHT = wxc.wxBU_RIGHT
+wxBU_BOTTOM = wxc.wxBU_BOTTOM
+wxBU_EXACTFIT = wxc.wxBU_EXACTFIT
 wxSP_VERTICAL = wxc.wxSP_VERTICAL
 wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
 wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
@@ -416,6 +421,7 @@ wxPD_ELAPSED_TIME = wxc.wxPD_ELAPSED_TIME
 wxPD_ESTIMATED_TIME = wxc.wxPD_ESTIMATED_TIME
 wxPD_REMAINING_TIME = wxc.wxPD_REMAINING_TIME
 wxDD_NEW_DIR_BUTTON = wxc.wxDD_NEW_DIR_BUTTON
+wxDD_DEFAULT_STYLE = wxc.wxDD_DEFAULT_STYLE
 wxMENU_TEAROFF = wxc.wxMENU_TEAROFF
 wxMB_DOCKABLE = wxc.wxMB_DOCKABLE
 wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE
@@ -461,6 +467,8 @@ wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
 wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
 wxMM_POINTS = wxc.wxMM_POINTS
 wxMM_METRIC = wxc.wxMM_METRIC
+wxTIMER_CONTINUOUS = wxc.wxTIMER_CONTINUOUS
+wxTIMER_ONE_SHOT = wxc.wxTIMER_ONE_SHOT
 wxBORDER_DEFAULT = wxc.wxBORDER_DEFAULT
 wxBORDER_NONE = wxc.wxBORDER_NONE
 wxBORDER_STATIC = wxc.wxBORDER_STATIC
@@ -832,6 +840,7 @@ wxEVT_NC_LEAVE_WINDOW = wxc.wxEVT_NC_LEAVE_WINDOW
 wxEVT_NC_LEFT_DCLICK = wxc.wxEVT_NC_LEFT_DCLICK
 wxEVT_NC_MIDDLE_DCLICK = wxc.wxEVT_NC_MIDDLE_DCLICK
 wxEVT_NC_RIGHT_DCLICK = wxc.wxEVT_NC_RIGHT_DCLICK
+wxEVT_SET_CURSOR = wxc.wxEVT_SET_CURSOR
 wxEVT_CHAR = wxc.wxEVT_CHAR
 wxEVT_KEY_DOWN = wxc.wxEVT_KEY_DOWN
 wxEVT_KEY_UP = wxc.wxEVT_KEY_UP
@@ -1039,6 +1048,9 @@ def EVT_WINDOW_CREATE(win, func):
 def EVT_WINDOW_DESTROY(win, func):
     win.Connect(-1, -1, wxEVT_DESTROY, func)
 
+def EVT_SET_CURSOR(win, func):
+    win.Connect(-1, -1, wxEVT_SET_CURSOR, func)
+
 
 
 def EVT_IDLE(win, func):
@@ -1628,7 +1640,7 @@ class wxPyOnDemandOutputWindow:
             self.frame.Close()
 
 
-_defRedirect = (wxPlatform == '__WXMSW__')
+_defRedirect = (wxPlatform == '__WXMSW__' or wxPlatform == '__WXMAC__')
 
 #----------------------------------------------------------------------
 # The main application class.  Derive from this and implement an OnInit