X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..cdad5e204bef2f4a9507a5a25cc1da8057020565:/wxPython/contrib/ogl/oglcanvas.py?ds=inline diff --git a/wxPython/contrib/ogl/oglcanvas.py b/wxPython/contrib/ogl/oglcanvas.py index 2467d6f08d..218121aae1 100644 --- a/wxPython/contrib/ogl/oglcanvas.py +++ b/wxPython/contrib/ogl/oglcanvas.py @@ -41,13 +41,10 @@ from filesys import * from utils import * import wx -class wxDiagramPtr : +class wxDiagramPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def __del__(self,oglcanvasc=oglcanvasc): - if self.thisown == 1 : - oglcanvasc.delete_wxDiagram(self) def AddShape(self, *_args, **_kwargs): val = apply(oglcanvasc.wxDiagram_AddShape,(self,) + _args, _kwargs) return val @@ -62,11 +59,9 @@ class wxDiagramPtr : return val def FindShape(self, *_args, **_kwargs): val = apply(oglcanvasc.wxDiagram_FindShape,(self,) + _args, _kwargs) - if val: val = wxPyShapePtr(val) return val def GetCanvas(self, *_args, **_kwargs): val = apply(oglcanvasc.wxDiagram_GetCanvas,(self,) + _args, _kwargs) - if val: val = wxPyShapeCanvasPtr(val) return val def GetCount(self, *_args, **_kwargs): val = apply(oglcanvasc.wxDiagram_GetCount,(self,) + _args, _kwargs) @@ -165,7 +160,6 @@ class wxPyShapeCanvasPtr(wxScrolledWindowPtr): return val def GetDiagram(self, *_args, **_kwargs): val = apply(oglcanvasc.wxPyShapeCanvas_GetDiagram,(self,) + _args, _kwargs) - if val: val = wxDiagramPtr(val) return val def GetQuickEditMode(self, *_args, **_kwargs): val = apply(oglcanvasc.wxPyShapeCanvas_GetQuickEditMode,(self,) + _args, _kwargs)