compilation fix

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

diff --git a/wxPython/contrib/ogl/oglshapes2.i b/wxPython/contrib/ogl/oglshapes2.i
index ef2a7189587cefe501006054f0aa9d4135f337ab..89d4ee8f069fb06fd63d0c0a0e482b8baf69c91b 100644 (file)
--- a/wxPython/contrib/ogl/oglshapes2.i
+++ b/wxPython/contrib/ogl/oglshapes2.i
@@ -14,7 +14,7 @@
 %module oglshapes2
 
 %{
 %module oglshapes2
 
 %{

-#include "helpers.h"
+#include "export.h"

 #include "oglhelpers.h"
 %}
 
 #include "oglhelpers.h"
 %}
 


@@ -47,8 +47,9 @@ class wxPyEllipseShape : public wxPyShape {
 public:
     wxPyEllipseShape(double width = 0.0, double height = 0.0);
 
 public:
     wxPyEllipseShape(double width = 0.0, double height = 0.0);
 

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

 
     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);
 
     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);


@@ -90,8 +91,9 @@ class wxPyCircleShape : public wxPyEllipseShape {
 public:
     wxPyCircleShape(double width = 0.0);
 
 public:
     wxPyCircleShape(double width = 0.0);
 

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

 
     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);
 
     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);


@@ -125,7 +127,7 @@ public:
 };
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 };
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

-class wxArrowHead {
+class wxArrowHead : public wxObject {

 public:
     wxArrowHead(int type = 0,
                 int end = 0,
 public:
     wxArrowHead(int type = 0,
                 int end = 0,


@@ -162,8 +164,9 @@ class wxPyLineShape : public wxPyShape {
 public:
     wxPyLineShape();
 
 public:
     wxPyLineShape();
 

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

 
     void AddArrow(int type, int end = ARROW_POSITION_END,
                   double arrowSize = 10.0, double xOffset = 0.0,
 
     void AddArrow(int type, int end = ARROW_POSITION_END,
                   double arrowSize = 10.0, double xOffset = 0.0,


@@ -207,6 +210,14 @@ public:
     bool IsSpline();
     void MakeLineControlPoints(int n);
 
     bool IsSpline();
     void MakeLineControlPoints(int n);
 

+    //   inline wxList *GetLineControlPoints() { return m_lineControlPoints; }
+    %addmethods {
+        PyObject* GetLineControlPoints() {
+            wxList* list = self->GetLineControlPoints();
+            return wxPy_ConvertList(list, "wxPyControlPoint");
+        }
+    }
+

     void SetAttachmentFrom(int fromAttach);
     void SetAttachments(int fromAttach, int toAttach);
     void SetAttachmentTo(int toAttach);
     void SetAttachmentFrom(int fromAttach);
     void SetAttachments(int fromAttach, int toAttach);
     void SetAttachmentTo(int toAttach);


@@ -259,8 +270,9 @@ class wxPyPolygonShape : public wxPyShape {
 public:
     wxPyPolygonShape();
 
 public:
     wxPyPolygonShape();
 

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

 
 
     // void Create(wxList* points);
 
 
     // void Create(wxList* points);


@@ -330,8 +342,9 @@ class wxPyTextShape : public wxPyRectangleShape {
 public:
     wxPyTextShape(double width = 0.0, double height = 0.0);
 
 public:
     wxPyTextShape(double width = 0.0, double height = 0.0);
 

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

 
 
     void base_OnDelete();
 
 
     void base_OnDelete();