Don't use PyThreadState_Swap to get the current tstate, block threads

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

diff --git a/wxPython/contrib/ogl/_oglshapes.i b/wxPython/contrib/ogl/_oglshapes.i
index db2111178ff9f96847bbc0395226d65a295dfcdd..18e28fcc5c4186a91592da3017b0726fe11c67a3 100644 (file)
--- a/wxPython/contrib/ogl/_oglshapes.i
+++ b/wxPython/contrib/ogl/_oglshapes.i
@@ -124,13 +124,14 @@ public:
 
 class wxPyRectangleShape : public wxPyShape {
 public:
 
 class wxPyRectangleShape : public wxPyShape {
 public:

-    %addtofunc wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"
+    %pythonAppend wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"

     
     wxPyRectangleShape(double width = 0.0, double height = 0.0);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     void SetCornerRadius(double radius);
     
     wxPyRectangleShape(double width = 0.0, double height = 0.0);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     void SetCornerRadius(double radius);

-
+    double GetCornerRadius();
+    

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


@@ -171,7 +172,7 @@ public:
 
 class wxPyControlPoint : public wxPyRectangleShape {
 public:
 
 class wxPyControlPoint : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"
+    %pythonAppend wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"

     
     wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
                      wxPyShape *object = NULL,
     
     wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
                      wxPyShape *object = NULL,


@@ -222,7 +223,7 @@ public:
 
 class wxPyBitmapShape : public wxPyRectangleShape {
 public:
 
 class wxPyBitmapShape : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"
+    %pythonAppend wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"

     
     wxPyBitmapShape();
 
     
     wxPyBitmapShape();
 


@@ -272,7 +273,7 @@ public:
 
 class wxPyDrawnShape : public wxPyRectangleShape {
 public:
 
 class wxPyDrawnShape : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"
+    %pythonAppend wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"

     
     wxPyDrawnShape();
 
     
     wxPyDrawnShape();
 


@@ -377,7 +378,7 @@ public:
 
 class wxPyCompositeShape : public wxPyRectangleShape {
 public:
 
 class wxPyCompositeShape : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"
+    %pythonAppend wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"

     
     wxPyCompositeShape();
 
     
     wxPyCompositeShape();
 


@@ -475,7 +476,7 @@ public:
 
 class wxPyDividedShape : public wxPyRectangleShape {
 public:
 
 class wxPyDividedShape : public wxPyRectangleShape {
 public:

-    %addtofunc wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"
+    %pythonAppend wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"

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


@@ -525,7 +526,7 @@ public:
 
 class wxPyDivisionShape : public wxPyCompositeShape {
 public:
 
 class wxPyDivisionShape : public wxPyCompositeShape {
 public:

-    %addtofunc wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"
+    %pythonAppend wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"

     
     wxPyDivisionShape();
 
     
     wxPyDivisionShape();