wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

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

diff --git a/wxPython/src/gtk/frames.py b/wxPython/src/gtk/frames.py
index 0fae1a5d20eb372452e07c9a17eabdf338990731..77aa341cbaa1bf3c0e259b479e2966f9fb19c9c0 100644 (file)
--- a/wxPython/src/gtk/frames.py
+++ b/wxPython/src/gtk/frames.py
@@ -22,57 +22,60 @@ class wxTopLevelWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_Create,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_Create(self, *_args, **_kwargs)
         return val
     def Maximize(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_Maximize,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_Maximize(self, *_args, **_kwargs)
         return val
     def Restore(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_Restore,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_Restore(self, *_args, **_kwargs)
         return val
     def Iconize(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_Iconize,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_Iconize(self, *_args, **_kwargs)
         return val
     def IsMaximized(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_IsMaximized,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_IsMaximized(self, *_args, **_kwargs)
         return val
     def IsIconized(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_IsIconized,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_IsIconized(self, *_args, **_kwargs)
         return val
     def GetIcon(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_GetIcon,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_GetIcon(self, *_args, **_kwargs)
         if val: val = wxIconPtr(val) ; val.thisown = 1
         return val
     def SetIcon(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_SetIcon,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_SetIcon(self, *_args, **_kwargs)
         return val
     def SetIcons(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_SetIcons,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_SetIcons(self, *_args, **_kwargs)
         return val
     def ShowFullScreen(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_ShowFullScreen,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_ShowFullScreen(self, *_args, **_kwargs)
         return val
     def IsFullScreen(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_IsFullScreen,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_IsFullScreen(self, *_args, **_kwargs)
         return val
     def SetTitle(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_SetTitle,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_SetTitle(self, *_args, **_kwargs)
         return val
     def GetTitle(self, *_args, **_kwargs):
-        val = apply(framesc.wxTopLevelWindow_GetTitle,(self,) + _args, _kwargs)
+        val = framesc.wxTopLevelWindow_GetTitle(self, *_args, **_kwargs)
+        return val
+    def SetShape(self, *_args, **_kwargs):
+        val = framesc.wxTopLevelWindow_SetShape(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxTopLevelWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxTopLevelWindow(wxTopLevelWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxTopLevelWindow,_args,_kwargs)
+        self.this = framesc.new_wxTopLevelWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreTopLevelWindow(*_args,**_kwargs):
-    val = wxTopLevelWindowPtr(apply(framesc.new_wxPreTopLevelWindow,_args,_kwargs))
+    val = wxTopLevelWindowPtr(framesc.new_wxPreTopLevelWindow(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -83,76 +86,76 @@ class wxFramePtr(wxTopLevelWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_Create,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_Create(self, *_args, **_kwargs)
         return val
     def GetClientAreaOrigin(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetClientAreaOrigin,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_GetClientAreaOrigin(self, *_args, **_kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def SetMenuBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetMenuBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetMenuBar(self, *_args, **_kwargs)
         return val
     def GetMenuBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetMenuBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_GetMenuBar(self, *_args, **_kwargs)
         return val
     def ProcessCommand(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_ProcessCommand,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_ProcessCommand(self, *_args, **_kwargs)
         return val
     def CreateStatusBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_CreateStatusBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_CreateStatusBar(self, *_args, **_kwargs)
         return val
     def GetStatusBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetStatusBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_GetStatusBar(self, *_args, **_kwargs)
         return val
     def SetStatusBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetStatusBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetStatusBar(self, *_args, **_kwargs)
         return val
     def SetStatusText(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetStatusText,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetStatusText(self, *_args, **_kwargs)
         return val
     def SetStatusWidths(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetStatusWidths,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetStatusWidths(self, *_args, **_kwargs)
         return val
     def PushStatusText(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_PushStatusText,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_PushStatusText(self, *_args, **_kwargs)
         return val
     def PopStatusText(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_PopStatusText,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_PopStatusText(self, *_args, **_kwargs)
         return val
     def DoGiveHelp(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_DoGiveHelp,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_DoGiveHelp(self, *_args, **_kwargs)
         return val
     def SetStatusBarPane(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetStatusBarPane,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetStatusBarPane(self, *_args, **_kwargs)
         return val
     def GetStatusBarPane(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetStatusBarPane,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_GetStatusBarPane(self, *_args, **_kwargs)
         return val
     def CreateToolBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_CreateToolBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_CreateToolBar(self, *_args, **_kwargs)
         return val
     def GetToolBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_GetToolBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_GetToolBar(self, *_args, **_kwargs)
         return val
     def SetToolBar(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SetToolBar,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SetToolBar(self, *_args, **_kwargs)
         return val
     def SendSizeEvent(self, *_args, **_kwargs):
-        val = apply(framesc.wxFrame_SendSizeEvent,(self,) + _args, _kwargs)
+        val = framesc.wxFrame_SendSizeEvent(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxFrame instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     Command = ProcessCommand
 class wxFrame(wxFramePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxFrame,_args,_kwargs)
+        self.this = framesc.new_wxFrame(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreFrame(*_args,**_kwargs):
-    val = wxFramePtr(apply(framesc.new_wxPreFrame,_args,_kwargs))
+    val = wxFramePtr(framesc.new_wxPreFrame(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -163,47 +166,47 @@ class wxDialogPtr(wxTopLevelWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_Create,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_Create(self, *_args, **_kwargs)
         return val
     def Centre(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_Centre,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_Centre(self, *_args, **_kwargs)
         return val
     def EndModal(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_EndModal,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_EndModal(self, *_args, **_kwargs)
         return val
     def SetModal(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_SetModal,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_SetModal(self, *_args, **_kwargs)
         return val
     def IsModal(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_IsModal,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_IsModal(self, *_args, **_kwargs)
         return val
     def ShowModal(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_ShowModal,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_ShowModal(self, *_args, **_kwargs)
         return val
     def GetReturnCode(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_GetReturnCode,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_GetReturnCode(self, *_args, **_kwargs)
         return val
     def SetReturnCode(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_SetReturnCode,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_SetReturnCode(self, *_args, **_kwargs)
         return val
     def CreateTextSizer(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_CreateTextSizer(self, *_args, **_kwargs)
         return val
     def CreateButtonSizer(self, *_args, **_kwargs):
-        val = apply(framesc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
+        val = framesc.wxDialog_CreateButtonSizer(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxDialog instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxDialog(wxDialogPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxDialog,_args,_kwargs)
+        self.this = framesc.new_wxDialog(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreDialog(*_args,**_kwargs):
-    val = wxDialogPtr(apply(framesc.new_wxPreDialog,_args,_kwargs))
+    val = wxDialogPtr(framesc.new_wxPreDialog(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -214,20 +217,20 @@ class wxMiniFramePtr(wxFramePtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(framesc.wxMiniFrame_Create,(self,) + _args, _kwargs)
+        val = framesc.wxMiniFrame_Create(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxMiniFrame instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxMiniFrame(wxMiniFramePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxMiniFrame,_args,_kwargs)
+        self.this = framesc.new_wxMiniFrame(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreMiniFrame(*_args,**_kwargs):
-    val = wxMiniFramePtr(apply(framesc.new_wxPreMiniFrame,_args,_kwargs))
+    val = wxMiniFramePtr(framesc.new_wxPreMiniFrame(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -238,17 +241,17 @@ class wxSplashScreenWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def SetBitmap(self, *_args, **_kwargs):
-        val = apply(framesc.wxSplashScreenWindow_SetBitmap,(self,) + _args, _kwargs)
+        val = framesc.wxSplashScreenWindow_SetBitmap(self, *_args, **_kwargs)
         return val
     def GetBitmap(self, *_args, **_kwargs):
-        val = apply(framesc.wxSplashScreenWindow_GetBitmap,(self,) + _args, _kwargs)
+        val = framesc.wxSplashScreenWindow_GetBitmap(self, *_args, **_kwargs)
         if val: val = wxBitmapPtr(val) 
         return val
     def __repr__(self):
-        return "<C wxSplashScreenWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSplashScreenWindow(wxSplashScreenWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxSplashScreenWindow,_args,_kwargs)
+        self.this = framesc.new_wxSplashScreenWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
@@ -260,20 +263,20 @@ class wxSplashScreenPtr(wxFramePtr):
         self.this = this
         self.thisown = 0
     def GetSplashStyle(self, *_args, **_kwargs):
-        val = apply(framesc.wxSplashScreen_GetSplashStyle,(self,) + _args, _kwargs)
+        val = framesc.wxSplashScreen_GetSplashStyle(self, *_args, **_kwargs)
         return val
     def GetSplashWindow(self, *_args, **_kwargs):
-        val = apply(framesc.wxSplashScreen_GetSplashWindow,(self,) + _args, _kwargs)
+        val = framesc.wxSplashScreen_GetSplashWindow(self, *_args, **_kwargs)
         if val: val = wxSplashScreenWindowPtr(val) 
         return val
     def GetTimeout(self, *_args, **_kwargs):
-        val = apply(framesc.wxSplashScreen_GetTimeout,(self,) + _args, _kwargs)
+        val = framesc.wxSplashScreen_GetTimeout(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSplashScreen instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSplashScreen(wxSplashScreenPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(framesc.new_wxSplashScreen,_args,_kwargs)
+        self.this = framesc.new_wxSplashScreen(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)