X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4e928794167715f19a3021d62b7c4f77611694..b9ac87bc5cbe46227195e32c44e25831f8206e3c:/wxPython/contrib/ogl/oglshapes2.py diff --git a/wxPython/contrib/ogl/oglshapes2.py b/wxPython/contrib/ogl/oglshapes2.py index a3c053c580..60d4c2947e 100644 --- a/wxPython/contrib/ogl/oglshapes2.py +++ b/wxPython/contrib/ogl/oglshapes2.py @@ -9,6 +9,8 @@ from windows import * from gdi import * +from fonts import * + from clip_dnd import * from events import * @@ -255,9 +257,12 @@ class wxArrowHeadPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def __del__(self,oglshapes2c=oglshapes2c): - if self.thisown == 1 : - oglshapes2c.delete_wxArrowHead(self) + def __del__(self, delfunc=oglshapes2c.delete_wxArrowHead): + if self.thisown == 1: + try: + delfunc(self) + except: + pass def _GetType(self, *_args, **_kwargs): val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs) return val @@ -391,7 +396,7 @@ class wxPyLineShapePtr(wxPyShapePtr): return val def GetNextControlPoint(self, *_args, **_kwargs): val = apply(oglshapes2c.wxPyLineShape_GetNextControlPoint,(self,) + _args, _kwargs) - if val: val = wxPointPtr(val) + if val: val = wxRealPointPtr(val) return val def GetTo(self, *_args, **_kwargs): val = apply(oglshapes2c.wxPyLineShape_GetTo,(self,) + _args, _kwargs)