For Python 2.2 builds

[wxWidgets.git] / wxPython / contrib / ogl / oglshapes.i

diff --git a/wxPython/contrib/ogl/oglshapes.i b/wxPython/contrib/ogl/oglshapes.i
index 6beaa08a41065f42a5b1e31a4e86e26d3d209dd7..d29501a05572358b6ad8714d91f8701ce5cc4711 100644 (file)
--- a/wxPython/contrib/ogl/oglshapes.i
+++ b/wxPython/contrib/ogl/oglshapes.i
@@ -40,7 +40,7 @@
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 

-class wxPseudoMetaFile {
+class wxPseudoMetaFile : public wxObject {

 public:
   wxPseudoMetaFile();
   ~wxPseudoMetaFile();
 public:
   wxPseudoMetaFile();
   ~wxPseudoMetaFile();


@@ -108,8 +108,8 @@ class wxPyRectangleShape : public wxPyShape {
 public:
     wxPyRectangleShape(double width = 0.0, double height = 0.0);
 
 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)"

 
     void SetCornerRadius(double radius);
 
 
     void SetCornerRadius(double radius);
 


@@ -158,8 +158,8 @@ public:
                      double size = 0.0, double the_xoffset = 0.0,
                      double the_yoffset = 0.0, int the_type = 0);
 
                      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)"

 
     void SetCornerRadius(double radius);
 
 
     void SetCornerRadius(double radius);
 


@@ -205,8 +205,8 @@ class wxPyBitmapShape : public wxPyRectangleShape {
 public:
     wxPyBitmapShape();
 
 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)"

 
     wxBitmap& GetBitmap();
     wxString GetFilename();
 
     wxBitmap& GetBitmap();
     wxString GetFilename();


@@ -254,8 +254,8 @@ class wxPyDrawnShape : public wxPyRectangleShape {
 public:
     wxPyDrawnShape();
 
 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)"

 
     void CalculateSize();
     void DestroyClippingRect();
 
     void CalculateSize();
     void DestroyClippingRect();


@@ -326,7 +326,7 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxOGLConstraint  {
+class wxOGLConstraint : public wxObject {

 public:
     //wxOGLConstraint(int type, wxPyShape *constraining, wxList& constrained);
     %addmethods {
 public:
     //wxOGLConstraint(int type, wxPyShape *constraining, wxList& constrained);
     %addmethods {


@@ -337,7 +337,8 @@ public:
             return rv;
         }
     }
             return rv;
         }
     }

-    ~wxOGLConstraint();
+
+    //~wxOGLConstraint();  The wxCompositShape takes ownership of the constraint

 
     bool Evaluate();
     void SetSpacing(double x, double y);
 
     bool Evaluate();
     void SetSpacing(double x, double y);


@@ -357,8 +358,8 @@ class wxPyCompositeShape : public wxPyRectangleShape {
 public:
     wxPyCompositeShape();
 
 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)"

 
     void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
 
 
     void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
 


@@ -455,8 +456,8 @@ class wxPyDividedShape : public wxPyRectangleShape {
 public:
     wxPyDividedShape(double width = 0.0, double height = 0.0);
 
 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)"

 
     void EditRegions();
     void SetRegionSizes();
 
     void EditRegions();
     void SetRegionSizes();


@@ -504,8 +505,8 @@ class wxPyDivisionShape : public wxPyCompositeShape {
 public:
     wxPyDivisionShape();
 
 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)"

 
     void AdjustBottom(double bottom, bool test);
     void AdjustLeft(double left, bool test);
 
     void AdjustBottom(double bottom, bool test);
     void AdjustLeft(double left, bool test);