X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08da19d737fcb12a19a2746b438b3a3610214e6d..d94974609888885e0b75d0e01d901b03a6213979:/wxPython/contrib/ogl/oglshapes.py

diff --git a/wxPython/contrib/ogl/oglshapes.py b/wxPython/contrib/ogl/oglshapes.py
index bce43eeda9..4090867d08 100644
--- a/wxPython/contrib/ogl/oglshapes.py
+++ b/wxPython/contrib/ogl/oglshapes.py
@@ -9,6 +9,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -47,18 +49,15 @@ class wxPseudoMetaFilePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,oglshapesc=oglshapesc):
-        if self.thisown == 1 :
-            oglshapesc.delete_wxPseudoMetaFile(self)
+    def __del__(self, delfunc=oglshapesc.delete_wxPseudoMetaFile):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def Draw(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPseudoMetaFile_Draw,(self,) + _args, _kwargs)
         return val
-    def WriteAttributes(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPseudoMetaFile_WriteAttributes,(self,) + _args, _kwargs)
-        return val
-    def ReadAttributes(self, *_args, **_kwargs):
-        val = apply(oglshapesc.wxPseudoMetaFile_ReadAttributes,(self,) + _args, _kwargs)
-        return val
     def Clear(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPseudoMetaFile_Clear,(self,) + _args, _kwargs)
         return val
@@ -289,6 +288,7 @@ class wxPyRectangleShape(wxPyRectangleShapePtr):
         self.this = apply(oglshapesc.new_wxPyRectangleShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyRectangleShape)
+        self._setOORInfo(self)
 
 
 
@@ -397,6 +397,7 @@ class wxPyControlPoint(wxPyControlPointPtr):
         self.this = apply(oglshapesc.new_wxPyControlPoint,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyControlPoint)
+        self._setOORInfo(self)
 
 
 
@@ -515,6 +516,7 @@ class wxPyBitmapShape(wxPyBitmapShapePtr):
         self.this = apply(oglshapesc.new_wxPyBitmapShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyBitmapShape)
+        self._setOORInfo(self)
 
 
 
@@ -704,6 +706,7 @@ class wxPyDrawnShape(wxPyDrawnShapePtr):
         self.this = apply(oglshapesc.new_wxPyDrawnShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyDrawnShape)
+        self._setOORInfo(self)
 
 
 
@@ -874,6 +877,7 @@ class wxPyCompositeShape(wxPyCompositeShapePtr):
         self.this = apply(oglshapesc.new_wxPyCompositeShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyCompositeShape)
+        self._setOORInfo(self)
 
 
 
@@ -985,6 +989,7 @@ class wxPyDividedShape(wxPyDividedShapePtr):
         self.this = apply(oglshapesc.new_wxPyDividedShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyDividedShape)
+        self._setOORInfo(self)
 
 
 
@@ -1167,6 +1172,7 @@ class wxPyDivisionShape(wxPyDivisionShapePtr):
         self.this = apply(oglshapesc.new_wxPyDivisionShape,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyDivisionShape)
+        self._setOORInfo(self)