X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..0a8c1efb27d88faa8d29ca541a953657ec85487f:/wxPython/contrib/ogl/oglbasic.py diff --git a/wxPython/contrib/ogl/oglbasic.py b/wxPython/contrib/ogl/oglbasic.py index bcb2658308..9a6e352b25 100644 --- a/wxPython/contrib/ogl/oglbasic.py +++ b/wxPython/contrib/ogl/oglbasic.py @@ -15,6 +15,8 @@ from events import * from streams import * +from utils import * + from mdi import * from frames import * @@ -38,8 +40,6 @@ from printfw import * from sizers import * from filesys import * - -from utils import * import wx from oglcanvas import wxPyShapeCanvasPtr class wxShapeRegionPtr(wxObjectPtr): @@ -147,8 +147,8 @@ class wxPyShapeEvtHandlerPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def _setSelf(self, *_args, **_kwargs): - val = apply(oglbasicc.wxPyShapeEvtHandler__setSelf,(self,) + _args, _kwargs) + def _setCallbackInfo(self, *_args, **_kwargs): + val = apply(oglbasicc.wxPyShapeEvtHandler__setCallbackInfo,(self,) + _args, _kwargs) return val def Destroy(self, *_args, **_kwargs): val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs) @@ -261,7 +261,7 @@ class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr): def __init__(self,*_args,**_kwargs): self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs) self.thisown = 1 - self._setSelf(self, wxPyShapeEvtHandler) + self._setCallbackInfo(self, wxPyShapeEvtHandler) @@ -270,8 +270,8 @@ class wxPyShapePtr(wxPyShapeEvtHandlerPtr): def __init__(self,this): self.this = this self.thisown = 0 - def _setSelf(self, *_args, **_kwargs): - val = apply(oglbasicc.wxPyShape__setSelf,(self,) + _args, _kwargs) + def _setCallbackInfo(self, *_args, **_kwargs): + val = apply(oglbasicc.wxPyShape__setCallbackInfo,(self,) + _args, _kwargs) return val def Destroy(self, *_args, **_kwargs): val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)