Calling a virtual function from a destructor is not good:

[wxWidgets.git] / wxPython / src / mac / image.py

diff --git a/wxPython/src/mac/image.py b/wxPython/src/mac/image.py
index a96f5b3829d37d7cdfc9ff54f4494bd651c5f117..d19383f1784733052a5cc79dea290122a72463fa 100644 (file)
--- a/wxPython/src/mac/image.py
+++ b/wxPython/src/mac/image.py
@@ -192,9 +192,12 @@ class wxImagePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,imagec=imagec):
-        if self.thisown == 1 :
-            imagec.delete_wxImage(self)
+    def __del__(self, delfunc=imagec.delete_wxImage):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Create(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs)
         return val
@@ -227,9 +230,6 @@ class wxImagePtr(wxObjectPtr):
     def SetMaskFromImage(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SetMaskFromImage,(self,) + _args, _kwargs)
         return val
-    def DoFloodFill(self, *_args, **_kwargs):
-        val = apply(imagec.wxImage_DoFloodFill,(self,) + _args, _kwargs)
-        return val
     def LoadFile(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_LoadFile,(self,) + _args, _kwargs)
         return val
@@ -268,9 +268,15 @@ class wxImagePtr(wxObjectPtr):
     def Paste(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Paste,(self,) + _args, _kwargs)
         return val
+    def GetDataBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_GetDataBuffer,(self,) + _args, _kwargs)
+        return val
     def GetData(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_GetData,(self,) + _args, _kwargs)
         return val
+    def SetDataBuffer(self, *_args, **_kwargs):
+        val = apply(imagec.wxImage_SetDataBuffer,(self,) + _args, _kwargs)
+        return val
     def SetData(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_SetData,(self,) + _args, _kwargs)
         return val