X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/293a0a8677c1ea28e42d4a97c3ec9c2a757d1c0c..af2309c0fb59458b70a9645b140fbd1d7a4b801c:/wxPython/src/msw/wx.py

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index 5dee6b2830..d72f84b8a0 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -431,8 +431,6 @@ 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
-wxHW_SCROLLBAR_AUTO = wxc.wxHW_SCROLLBAR_AUTO
 wxJOYSTICK1 = wxc.wxJOYSTICK1
 wxJOYSTICK2 = wxc.wxJOYSTICK2
 wxJOY_BUTTON1 = wxc.wxJOY_BUTTON1
@@ -643,6 +641,7 @@ wxBITMAP_TYPE_PICT_RESOURCE = wxc.wxBITMAP_TYPE_PICT_RESOURCE
 wxBITMAP_TYPE_ICON = wxc.wxBITMAP_TYPE_ICON
 wxBITMAP_TYPE_ICON_RESOURCE = wxc.wxBITMAP_TYPE_ICON_RESOURCE
 wxBITMAP_TYPE_ANI = wxc.wxBITMAP_TYPE_ANI
+wxBITMAP_TYPE_IFF = wxc.wxBITMAP_TYPE_IFF
 wxBITMAP_TYPE_MACCURSOR = wxc.wxBITMAP_TYPE_MACCURSOR
 wxBITMAP_TYPE_MACCURSOR_RESOURCE = wxc.wxBITMAP_TYPE_MACCURSOR_RESOURCE
 wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
@@ -745,6 +744,22 @@ wxPAPER_A3_EXTRA_TRANSVERSE = wxc.wxPAPER_A3_EXTRA_TRANSVERSE
 wxDUPLEX_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
+wxHT_NOWHERE = wxc.wxHT_NOWHERE
+wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
+wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1
+wxHT_SCROLLBAR_ARROW_LINE_2 = wxc.wxHT_SCROLLBAR_ARROW_LINE_2
+wxHT_SCROLLBAR_ARROW_PAGE_1 = wxc.wxHT_SCROLLBAR_ARROW_PAGE_1
+wxHT_SCROLLBAR_ARROW_PAGE_2 = wxc.wxHT_SCROLLBAR_ARROW_PAGE_2
+wxHT_SCROLLBAR_THUMB = wxc.wxHT_SCROLLBAR_THUMB
+wxHT_SCROLLBAR_BAR_1 = wxc.wxHT_SCROLLBAR_BAR_1
+wxHT_SCROLLBAR_BAR_2 = wxc.wxHT_SCROLLBAR_BAR_2
+wxHT_SCROLLBAR_LAST = wxc.wxHT_SCROLLBAR_LAST
+wxHT_WINDOW_OUTSIDE = wxc.wxHT_WINDOW_OUTSIDE
+wxHT_WINDOW_INSIDE = wxc.wxHT_WINDOW_INSIDE
+wxHT_WINDOW_VERT_SCROLLBAR = wxc.wxHT_WINDOW_VERT_SCROLLBAR
+wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR
+wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER
+wxHT_MAX = wxc.wxHT_MAX
 FALSE = wxc.FALSE
 false = wxc.false
 TRUE = wxc.TRUE
@@ -844,6 +859,7 @@ wxEVT_MENU_INIT = wxc.wxEVT_MENU_INIT
 wxEVT_MENU_HIGHLIGHT = wxc.wxEVT_MENU_HIGHLIGHT
 wxEVT_POPUP_MENU_INIT = wxc.wxEVT_POPUP_MENU_INIT
 wxEVT_SYS_COLOUR_CHANGED = wxc.wxEVT_SYS_COLOUR_CHANGED
+wxEVT_DISPLAY_CHANGED = wxc.wxEVT_DISPLAY_CHANGED
 wxEVT_SETTING_CHANGED = wxc.wxEVT_SETTING_CHANGED
 wxEVT_QUERY_NEW_PALETTE = wxc.wxEVT_QUERY_NEW_PALETTE
 wxEVT_PALETTE_CHANGED = wxc.wxEVT_PALETTE_CHANGED
@@ -975,6 +991,9 @@ def EVT_INIT_DIALOG(win, func):
 def EVT_SYS_COLOUR_CHANGED(win, func):
     win.Connect(-1, -1, wxEVT_SYS_COLOUR_CHANGED, func)
 
+def EVT_DISPLAY_CHANGED(win, func):
+    win.Connect(-1, -1, wxEVT_DISPLAY_CHANGED, func)
+
 def EVT_SHOW(win, func):
     win.Connect(-1, -1, wxEVT_SHOW, func)
 
@@ -1655,7 +1674,15 @@ class __wxPyCleanup:
     def __del__(self):
         self.cleanup()
 
-__cleanMeUp = __wxPyCleanup()
+sys.__wxPythonCleanup = __wxPyCleanup()
+
+## # another possible solution, but it gets called too eary...
+## if sys.version[0] == '2':
+##     import atexit
+##     atexit.register(wxc.wxApp_CleanUp)
+## else:
+##     sys.exitfunc = wxc.wxApp_CleanUp
+
 
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------