X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a323d3bda70a87bdfe11c835617185dd8060724c..fd657b8a5907c8584db84c85535ce281bdd65193:/wxPython/src/gtk/windows3.py

diff --git a/wxPython/src/gtk/windows3.py b/wxPython/src/gtk/windows3.py
index 994e73cca0..dd7b26accd 100644
--- a/wxPython/src/gtk/windows3.py
+++ b/wxPython/src/gtk/windows3.py
@@ -28,29 +28,29 @@ class wxSashEventPtr(wxCommandEventPtr):
         self.this = this
         self.thisown = 0
     def SetEdge(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_SetEdge,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetEdge(self, *_args, **_kwargs)
         return val
     def GetEdge(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_GetEdge,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetEdge(self, *_args, **_kwargs)
         return val
     def SetDragRect(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_SetDragRect,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetDragRect(self, *_args, **_kwargs)
         return val
     def GetDragRect(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_GetDragRect,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetDragRect(self, *_args, **_kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
     def SetDragStatus(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_SetDragStatus,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetDragStatus(self, *_args, **_kwargs)
         return val
     def GetDragStatus(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashEvent_GetDragStatus,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetDragStatus(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSashEvent instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSashEvent(wxSashEventPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxSashEvent,_args,_kwargs)
+        self.this = windows3c.new_wxSashEvent(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -61,71 +61,71 @@ class wxSashWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_Create(self, *_args, **_kwargs)
         return val
     def GetSashVisible(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetSashVisible,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetSashVisible(self, *_args, **_kwargs)
         return val
     def GetDefaultBorderSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetDefaultBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetDefaultBorderSize(self, *_args, **_kwargs)
         return val
     def GetEdgeMargin(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetEdgeMargin,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetEdgeMargin(self, *_args, **_kwargs)
         return val
     def GetExtraBorderSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetExtraBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetExtraBorderSize(self, *_args, **_kwargs)
         return val
     def GetMaximumSizeX(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetMaximumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMaximumSizeX(self, *_args, **_kwargs)
         return val
     def GetMaximumSizeY(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetMaximumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMaximumSizeY(self, *_args, **_kwargs)
         return val
     def GetMinimumSizeX(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetMinimumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMinimumSizeX(self, *_args, **_kwargs)
         return val
     def GetMinimumSizeY(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_GetMinimumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMinimumSizeY(self, *_args, **_kwargs)
         return val
     def HasBorder(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_HasBorder,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_HasBorder(self, *_args, **_kwargs)
         return val
     def SetDefaultBorderSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetDefaultBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetDefaultBorderSize(self, *_args, **_kwargs)
         return val
     def SetExtraBorderSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetExtraBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetExtraBorderSize(self, *_args, **_kwargs)
         return val
     def SetMaximumSizeX(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetMaximumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMaximumSizeX(self, *_args, **_kwargs)
         return val
     def SetMaximumSizeY(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetMaximumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMaximumSizeY(self, *_args, **_kwargs)
         return val
     def SetMinimumSizeX(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetMinimumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMinimumSizeX(self, *_args, **_kwargs)
         return val
     def SetMinimumSizeY(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetMinimumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMinimumSizeY(self, *_args, **_kwargs)
         return val
     def SetSashVisible(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetSashVisible,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetSashVisible(self, *_args, **_kwargs)
         return val
     def SetSashBorder(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashWindow_SetSashBorder,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetSashBorder(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSashWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSashWindow(wxSashWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxSashWindow,_args,_kwargs)
+        self.this = windows3c.new_wxSashWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashWindow(*_args,**_kwargs):
-    val = wxSashWindowPtr(apply(windows3c.new_wxPreSashWindow,_args,_kwargs))
+    val = wxSashWindowPtr(windows3c.new_wxPreSashWindow(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -136,41 +136,41 @@ class wxQueryLayoutInfoEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def SetRequestedLength(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetRequestedLength,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetRequestedLength(self, *_args, **_kwargs)
         return val
     def GetRequestedLength(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetRequestedLength,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetRequestedLength(self, *_args, **_kwargs)
         return val
     def SetFlags(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetFlags(self, *_args, **_kwargs)
         return val
     def GetFlags(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetFlags(self, *_args, **_kwargs)
         return val
     def SetSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetSize,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetSize(self, *_args, **_kwargs)
         return val
     def GetSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetSize,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetSize(self, *_args, **_kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def SetOrientation(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetOrientation(self, *_args, **_kwargs)
         return val
     def GetOrientation(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetOrientation(self, *_args, **_kwargs)
         return val
     def SetAlignment(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetAlignment(self, *_args, **_kwargs)
         return val
     def GetAlignment(self, *_args, **_kwargs):
-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetAlignment(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxQueryLayoutInfoEvent instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxQueryLayoutInfoEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxQueryLayoutInfoEvent,_args,_kwargs)
+        self.this = windows3c.new_wxQueryLayoutInfoEvent(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -181,23 +181,23 @@ class wxCalculateLayoutEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def SetFlags(self, *_args, **_kwargs):
-        val = apply(windows3c.wxCalculateLayoutEvent_SetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_SetFlags(self, *_args, **_kwargs)
         return val
     def GetFlags(self, *_args, **_kwargs):
-        val = apply(windows3c.wxCalculateLayoutEvent_GetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_GetFlags(self, *_args, **_kwargs)
         return val
     def SetRect(self, *_args, **_kwargs):
-        val = apply(windows3c.wxCalculateLayoutEvent_SetRect,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_SetRect(self, *_args, **_kwargs)
         return val
     def GetRect(self, *_args, **_kwargs):
-        val = apply(windows3c.wxCalculateLayoutEvent_GetRect,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_GetRect(self, *_args, **_kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
     def __repr__(self):
-        return "<C wxCalculateLayoutEvent instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxCalculateLayoutEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxCalculateLayoutEvent,_args,_kwargs)
+        self.this = windows3c.new_wxCalculateLayoutEvent(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -208,35 +208,35 @@ class wxSashLayoutWindowPtr(wxSashWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_Create(self, *_args, **_kwargs)
         return val
     def GetAlignment(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_GetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_GetAlignment(self, *_args, **_kwargs)
         return val
     def GetOrientation(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_GetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_GetOrientation(self, *_args, **_kwargs)
         return val
     def SetAlignment(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_SetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetAlignment(self, *_args, **_kwargs)
         return val
     def SetDefaultSize(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_SetDefaultSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetDefaultSize(self, *_args, **_kwargs)
         return val
     def SetOrientation(self, *_args, **_kwargs):
-        val = apply(windows3c.wxSashLayoutWindow_SetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetOrientation(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSashLayoutWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSashLayoutWindow(wxSashLayoutWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxSashLayoutWindow,_args,_kwargs)
+        self.this = windows3c.new_wxSashLayoutWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashLayoutWindow(*_args,**_kwargs):
-    val = wxSashLayoutWindowPtr(apply(windows3c.new_wxPreSashLayoutWindow,_args,_kwargs))
+    val = wxSashLayoutWindowPtr(windows3c.new_wxPreSashLayoutWindow(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -246,23 +246,26 @@ class wxLayoutAlgorithmPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,windows3c=windows3c):
-        if self.thisown == 1 :
-            windows3c.delete_wxLayoutAlgorithm(self)
+    def __del__(self, delfunc=windows3c.delete_wxLayoutAlgorithm):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def LayoutMDIFrame(self, *_args, **_kwargs):
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutMDIFrame(self, *_args, **_kwargs)
         return val
     def LayoutFrame(self, *_args, **_kwargs):
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutFrame(self, *_args, **_kwargs)
         return val
     def LayoutWindow(self, *_args, **_kwargs):
-        val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutWindow(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxLayoutAlgorithm instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxLayoutAlgorithm instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxLayoutAlgorithm,_args,_kwargs)
+        self.this = windows3c.new_wxLayoutAlgorithm(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -273,23 +276,23 @@ class wxPopupWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(windows3c.wxPopupWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupWindow_Create(self, *_args, **_kwargs)
         return val
     def Position(self, *_args, **_kwargs):
-        val = apply(windows3c.wxPopupWindow_Position,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupWindow_Position(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxPopupWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPopupWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxPopupWindow(wxPopupWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxPopupWindow,_args,_kwargs)
+        self.this = windows3c.new_wxPopupWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPrePopupWindow(*_args,**_kwargs):
-    val = wxPopupWindowPtr(apply(windows3c.new_wxPrePopupWindow,_args,_kwargs))
+    val = wxPopupWindowPtr(windows3c.new_wxPrePopupWindow(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -300,19 +303,19 @@ class wxPopupTransientWindowPtr(wxPopupWindowPtr):
         self.this = this
         self.thisown = 0
     def _setCallbackInfo(self, *_args, **_kwargs):
-        val = apply(windows3c.wxPopupTransientWindow__setCallbackInfo,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow__setCallbackInfo(self, *_args, **_kwargs)
         return val
     def Popup(self, *_args, **_kwargs):
-        val = apply(windows3c.wxPopupTransientWindow_Popup,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow_Popup(self, *_args, **_kwargs)
         return val
     def Dismiss(self, *_args, **_kwargs):
-        val = apply(windows3c.wxPopupTransientWindow_Dismiss,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow_Dismiss(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxPopupTransientWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPopupTransientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxPopupTransientWindow(wxPopupTransientWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxPopupTransientWindow,_args,_kwargs)
+        self.this = windows3c.new_wxPopupTransientWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPopupTransientWindow)
         self._setOORInfo(self)
@@ -320,7 +323,7 @@ class wxPopupTransientWindow(wxPopupTransientWindowPtr):
 
 
 def wxPrePopupTransientWindow(*_args,**_kwargs):
-    val = wxPopupTransientWindowPtr(apply(windows3c.new_wxPrePopupTransientWindow,_args,_kwargs))
+    val = wxPopupTransientWindowPtr(windows3c.new_wxPrePopupTransientWindow(*_args,**_kwargs))
     val.thisown = 1
     val._setOORInfo(val)
     return val
@@ -331,16 +334,16 @@ class wxTipWindowPtr(wxPopupTransientWindowPtr):
         self.this = this
         self.thisown = 0
     def SetBoundingRect(self, *_args, **_kwargs):
-        val = apply(windows3c.wxTipWindow_SetBoundingRect,(self,) + _args, _kwargs)
+        val = windows3c.wxTipWindow_SetBoundingRect(self, *_args, **_kwargs)
         return val
     def Close(self, *_args, **_kwargs):
-        val = apply(windows3c.wxTipWindow_Close,(self,) + _args, _kwargs)
+        val = windows3c.wxTipWindow_Close(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxTipWindow instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxTipWindow(wxTipWindowPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows3c.new_wxTipWindow,_args,_kwargs)
+        self.this = windows3c.new_wxTipWindow(*_args,**_kwargs)
         self.thisown = 1
         self._setOORInfo(self)