update from Tsolakos Stavros

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

diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index 5dff12250fc3304df17ed4caad9df2a3fb005c79..bc4da5bc13bc4c5455e8b55d849b8b8624d0546e 100644 (file)
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -164,8 +164,6 @@ def wxGetApp(*_args, **_kwargs):
 
 wxApp_CleanUp = wxc.wxApp_CleanUp
 
-wxPyApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
-
 wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
 
 wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
@@ -176,8 +174,6 @@ wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
 
 wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
 
-wxPyApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
-
 wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
 
 wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
@@ -373,6 +369,7 @@ wxID_HELP_COMMANDS = wxc.wxID_HELP_COMMANDS
 wxID_HELP_PROCEDURES = wxc.wxID_HELP_PROCEDURES
 wxID_HELP_CONTEXT = wxc.wxID_HELP_CONTEXT
 wxID_CLOSE_ALL = wxc.wxID_CLOSE_ALL
+wxID_PREFERENCES = wxc.wxID_PREFERENCES
 wxID_CUT = wxc.wxID_CUT
 wxID_COPY = wxc.wxID_COPY
 wxID_PASTE = wxc.wxID_PASTE
@@ -441,6 +438,7 @@ 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
+wxFULL_REPAINT_ON_RESIZE = wxc.wxFULL_REPAINT_ON_RESIZE
 wxLEFT = wxc.wxLEFT
 wxRIGHT = wxc.wxRIGHT
 wxUP = wxc.wxUP
@@ -1904,8 +1902,11 @@ of your Mac."""
         # KeyboardInterrupt???)  but will later segfault on exit.  By
         # setting the default handler then the app will exit, as
         # expected (depending on platform.)
-        import signal
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
+        try:
+            import signal
+            signal.signal(signal.SIGINT, signal.SIG_DFL)
+        except:
+            pass
 
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
@@ -1942,13 +1943,11 @@ of your Mac."""
 
 
 # change from wxPyApp_ to wxApp_
-wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
 wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
 wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
 wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
 wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
 wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
-wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
 wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
 wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
 wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId