SWIGged updates for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -49,6 +49,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
|
||||
def __del__(self,wxc=wxc):
|
||||
if self.thisown == 1 :
|
||||
wxc.delete_wxPyApp(self)
|
||||
def _setCallbackInfo(self, *_args, **_kwargs):
|
||||
val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetAppName(self, *_args, **_kwargs):
|
||||
val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs)
|
||||
return val
|
||||
@@ -112,12 +115,20 @@ class wxPyAppPtr(wxEvtHandlerPtr):
|
||||
def SetUseBestVisual(self, *_args, **_kwargs):
|
||||
val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetAssertMode(self, *_args, **_kwargs):
|
||||
val = apply(wxc.wxPyApp_GetAssertMode,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetAssertMode(self, *_args, **_kwargs):
|
||||
val = apply(wxc.wxPyApp_SetAssertMode,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxPyApp instance at %s>" % (self.this,)
|
||||
class wxPyApp(wxPyAppPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(wxc.new_wxPyApp,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxPyApp)
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -920,6 +931,9 @@ __version__ = wxc.__version__
|
||||
cvar = wxc.cvar
|
||||
wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
|
||||
wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)
|
||||
wxPYAPP_ASSERT_SUPPRESS = wxc.wxPYAPP_ASSERT_SUPPRESS
|
||||
wxPYAPP_ASSERT_EXCEPTION = wxc.wxPYAPP_ASSERT_EXCEPTION
|
||||
wxPYAPP_ASSERT_DIALOG = wxc.wxPYAPP_ASSERT_DIALOG
|
||||
|
||||
|
||||
#-------------- USER INCLUDE -----------------------
|
||||
@@ -1524,6 +1538,9 @@ wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
|
||||
wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont
|
||||
wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
|
||||
|
||||
|
||||
wxPyAssertionError = wxc.wxPyAssertionError
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# wxGTK sets the locale when initialized. Doing this at the Python
|
||||
# level should set it up to match what GTK is doing at the C level.
|
||||
@@ -1534,8 +1551,6 @@ if wxPlatform == "__WXGTK__":
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# wxWindows version numbers. wxPython version is in __version__.
|
||||
|
||||
@@ -1701,6 +1716,7 @@ class wxApp(wxPyApp):
|
||||
|
||||
if redirect:
|
||||
self.RedirectStdio(filename)
|
||||
|
||||
# this initializes wxWindows and then calls our OnInit
|
||||
_wxStart(self.OnInit)
|
||||
|
||||
@@ -1727,7 +1743,7 @@ class wxApp(wxPyApp):
|
||||
if filename:
|
||||
sys.stdout = sys.stderr = open(filename, 'a')
|
||||
else:
|
||||
self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow
|
||||
self.stdioWin = self.outputWindowClass()
|
||||
sys.stdout = sys.stderr = self.stdioWin
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user