embedded sample's README updates

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

diff --git a/wxPython/contrib/ogl/_oglshapes2.i b/wxPython/contrib/ogl/_oglshapes2.i
index febeead238afa78ee589f5cb4850c3ba87cf1f10..cdbb5de50795453b4df42dbff2bc5e0799d95e37 100644 (file)
--- a/wxPython/contrib/ogl/_oglshapes2.i
+++ b/wxPython/contrib/ogl/_oglshapes2.i
@@ -22,7 +22,7 @@
 
 class wxPyEllipseShape : public wxPyShape {
 public:
 
 class wxPyEllipseShape : public wxPyShape {
 public:

-    %addtofunc wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"
+    %pythonAppend wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"

     
     wxPyEllipseShape(double width = 0.0, double height = 0.0);
 
     
     wxPyEllipseShape(double width = 0.0, double height = 0.0);
 


@@ -66,7 +66,7 @@ public:
 
 class wxPyCircleShape : public wxPyEllipseShape {
 public:
 
 class wxPyCircleShape : public wxPyEllipseShape {
 public:

-    %addtofunc wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"
+    %pythonAppend wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"

     
     wxPyCircleShape(double width = 0.0);
 
     
     wxPyCircleShape(double width = 0.0);
 


@@ -141,7 +141,7 @@ public:
 
 class wxPyLineShape : public wxPyShape {
 public:
 
 class wxPyLineShape : public wxPyShape {
 public:

-    %addtofunc wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"
+    %pythonAppend wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"

     
     wxPyLineShape();
 
     
     wxPyLineShape();
 


@@ -209,6 +209,13 @@ public:
     void Unlink();
 
 
     void Unlink();
 
 

+    void SetAlignmentOrientation(bool isEnd, bool isHoriz);
+    void SetAlignmentType(bool isEnd, int alignType);
+    bool GetAlignmentOrientation(bool isEnd);
+    int GetAlignmentType(bool isEnd);
+    int GetAlignmentStart() const;
+    int GetAlignmentEnd() const;
+

     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);
     void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
     void base_OnDraw(wxDC& dc);
     void base_OnDrawContents(wxDC& dc);
     void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);


@@ -247,7 +254,7 @@ public:
 
 class wxPyPolygonShape : public wxPyShape {
 public:
 
 class wxPyPolygonShape : public wxPyShape {
 public:

-    %addtofunc wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"
+    %pythonAppend wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"

     
     wxPyPolygonShape();
 
     
     wxPyPolygonShape();
 


@@ -280,7 +287,7 @@ public:
             wxObject*   wxObj;
             wxNode*     node = list->GetFirst();
 
             wxObject*   wxObj;
             wxNode*     node = list->GetFirst();
 

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             pyList = PyList_New(0);
             while (node) {
                 wxObj = node->GetData();
             pyList = PyList_New(0);
             while (node) {
                 wxObj = node->GetData();


@@ -288,11 +295,36 @@ public:
                 PyList_Append(pyList, pyObj);
                 node = node->GetNext();
             }
                 PyList_Append(pyList, pyObj);
                 node = node->GetNext();
             }

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return pyList;
         }
             return pyList;
         }

+
+        PyObject* GetOriginalPoints() {
+            wxList* list = self->GetOriginalPoints();
+            PyObject*   pyList;
+            PyObject*   pyObj;
+            wxObject*   wxObj;
+            wxNode*     node = list->GetFirst();
+
+            bool blocked = wxPyBeginBlockThreads();
+            pyList = PyList_New(0);
+            while (node) {
+                wxObj = node->GetData();
+                pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
+                PyList_Append(pyList, pyObj);
+                node = node->GetNext();
+            }
+            wxPyEndBlockThreads(blocked);
+            return pyList;
+        }        

     }
 
     }
 

+    double GetOriginalWidth() const;
+    double GetOriginalHeight() const;
+
+    void SetOriginalWidth(double w);
+    void SetOriginalHeight(double h);
+

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


@@ -332,7 +364,7 @@ public:
 
 class wxPyTextShape : public wxPyRectangleShape {
 public:
 
 class wxPyTextShape : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"
+    %pythonAppend wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"

     
     wxPyTextShape(double width = 0.0, double height = 0.0);
 
     
     wxPyTextShape(double width = 0.0, double height = 0.0);