SWIGged updates for wxGTK

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

diff --git a/wxPython/src/gtk/cmndlgs.py b/wxPython/src/gtk/cmndlgs.py
index f1c5c95ea70527fb9be73dc5445cbd530c6c4aa4..9555d3bc8261e698459c27a6a8187f4a0948a2c1 100644 (file)
--- a/wxPython/src/gtk/cmndlgs.py
+++ b/wxPython/src/gtk/cmndlgs.py
@@ -41,9 +41,12 @@ class wxColourDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxColourData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxColourData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def GetChooseFull(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)
         return val
     def GetChooseFull(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)
         return val


@@ -271,9 +274,12 @@ class wxFontDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxFontData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxFontData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def EnableEffects(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)
         return val
     def EnableEffects(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)
         return val


@@ -427,9 +433,12 @@ class wxFindReplaceDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxFindReplaceData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxFindReplaceData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def GetFindString(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs)
         return val
     def GetFindString(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs)
         return val