For Python 2.2 builds

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

diff --git a/wxPython/contrib/ogl/oglbasic.i b/wxPython/contrib/ogl/oglbasic.i
index 43418c3833019757fbd3056232fac78226cca77b..6d66e15caa713423a0bdda8f8dcc28564f1227c5 100644 (file)
--- a/wxPython/contrib/ogl/oglbasic.i
+++ b/wxPython/contrib/ogl/oglbasic.i
@@ -42,7 +42,7 @@
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

-class wxShapeRegion {
+class wxShapeRegion : public wxObject {

 public:
     wxShapeRegion();
     //~wxShapeRegion();
 public:
     wxShapeRegion();
     //~wxShapeRegion();


@@ -87,17 +87,15 @@ public:
 %}
 
 
 %}
 
 

-class wxPyShapeEvtHandler {
+class wxPyShapeEvtHandler : public wxObject {

 public:
     wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
                         wxPyShape *shape = NULL);
 
 public:
     wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
                         wxPyShape *shape = NULL);
 

-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShapeEvtHandler)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyShapeEvtHandler)"

 
 

-    %addmethods {
-        void Destroy() { delete self; }
-    }
+    %addmethods { void Destroy() { delete self; } }

 
     void SetShape(wxPyShape *sh);
     wxPyShape *GetShape();
 
     void SetShape(wxPyShape *sh);
     wxPyShape *GetShape();


@@ -147,8 +145,8 @@ class wxPyShape : public wxPyShapeEvtHandler {
 public:
     // wxPyShape(wxPyShapeCanvas *can = NULL);     abstract base class...
 
 public:
     // wxPyShape(wxPyShapeCanvas *can = NULL);     abstract base class...
 

-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShape)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyShape)"

 
     %addmethods {
         void Destroy() { delete self; }
 
     %addmethods {
         void Destroy() { delete self; }


@@ -231,9 +229,11 @@ public:
     int GetAttachmentMode();
     void SetId(long i);
     long GetId();
     int GetAttachmentMode();
     void SetId(long i);
     long GetId();

+

     void SetPen(wxPen *pen);
     void SetBrush(wxBrush *brush);
 
     void SetPen(wxPen *pen);
     void SetBrush(wxBrush *brush);
 

+

     // void SetClientData(wxObject *client_data);
     // wxObject *GetClientData();
     %addmethods {
     // void SetClientData(wxObject *client_data);
     // wxObject *GetClientData();
     %addmethods {