X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/wxPython/contrib/ogl/oglshapes.i diff --git a/wxPython/contrib/ogl/oglshapes.i b/wxPython/contrib/ogl/oglshapes.i index 4b89b5a8c2..6f1ebc26b4 100644 --- a/wxPython/contrib/ogl/oglshapes.i +++ b/wxPython/contrib/ogl/oglshapes.i @@ -108,8 +108,9 @@ class wxPyRectangleShape : public wxPyShape { public: wxPyRectangleShape(double width = 0.0, double height = 0.0); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyRectangleShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyRectangleShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void SetCornerRadius(double radius); @@ -158,8 +159,9 @@ public: double size = 0.0, double the_xoffset = 0.0, double the_yoffset = 0.0, int the_type = 0); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyControlPoint)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyControlPoint)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void SetCornerRadius(double radius); @@ -205,8 +207,9 @@ class wxPyBitmapShape : public wxPyRectangleShape { public: wxPyBitmapShape(); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyBitmapShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyBitmapShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" wxBitmap& GetBitmap(); wxString GetFilename(); @@ -254,8 +257,9 @@ class wxPyDrawnShape : public wxPyRectangleShape { public: wxPyDrawnShape(); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDrawnShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDrawnShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void CalculateSize(); void DestroyClippingRect(); @@ -358,8 +362,9 @@ class wxPyCompositeShape : public wxPyRectangleShape { public: wxPyCompositeShape(); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyCompositeShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyCompositeShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL); @@ -456,8 +461,9 @@ class wxPyDividedShape : public wxPyRectangleShape { public: wxPyDividedShape(double width = 0.0, double height = 0.0); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDividedShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDividedShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void EditRegions(); void SetRegionSizes(); @@ -505,8 +511,9 @@ class wxPyDivisionShape : public wxPyCompositeShape { public: wxPyDivisionShape(); - void _setSelf(PyObject* self, PyObject* _class); - %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDivisionShape)" + void _setCallbackInfo(PyObject* self, PyObject* _class); + %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyDivisionShape)" + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" void AdjustBottom(double bottom, bool test); void AdjustLeft(double left, bool test);