Corrections in light of recent toolbar and other changes

[wxWidgets.git] / wxPython / contrib / ogl / ogl.cpp

diff --git a/wxPython/contrib/ogl/ogl.cpp b/wxPython/contrib/ogl/ogl.cpp
index 6b22bfbe16fa96063c4d3f28085417060b61e784..0d7cb576ec8df0c7745ff7608484ac5751baeaf9 100644 (file)
--- a/wxPython/contrib/ogl/ogl.cpp
+++ b/wxPython/contrib/ogl/ogl.cpp
@@ -96,17 +96,17 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 // the helper needs to know more about the type.
 
 wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
 // the helper needs to know more about the type.
 
 wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {

-    wxPyTState* state = wxPyBeginBlockThreads();
+    wxPyBeginBlockThreads();

     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     for (int x=0; x<count; x++) {
         return NULL;
     }
     for (int x=0; x<count; x++) {


@@ -117,29 +117,29 @@ wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
             char errmsg[1024];
             sprintf(errmsg, "Type error, expected list of %s objects", className);
             PyErr_SetString(PyExc_TypeError, errmsg);
             char errmsg[1024];
             sprintf(errmsg, "Type error, expected list of %s objects", className);
             PyErr_SetString(PyExc_TypeError, errmsg);

-            wxPyEndBlockThreads(state);
+            wxPyEndBlockThreads();

             return NULL;
         }
         list->Append(wxo);
     }
             return NULL;
         }
         list->Append(wxo);
     }

-    wxPyEndBlockThreads(state);
+    wxPyEndBlockThreads();

     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
     return list;
 }
 
 //---------------------------------------------------------------------------
 
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {

-    wxPyTState* state = wxPyBeginBlockThreads();
+    wxPyBeginBlockThreads();

     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
     if (!PyList_Check(pyList)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
         return NULL;
     }
     int count = PyList_Size(pyList);
     wxList* list = new wxList;
     if (! list) {
         PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

         return NULL;
     }
     for (int x=0; x<count; x++) {
         return NULL;
     }
     for (int x=0; x<count; x++) {


@@ -158,13 +158,13 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
             wxRealPoint* wxo = NULL;
             if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
             wxRealPoint* wxo = NULL;
             if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
                 PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");

-                wxPyEndBlockThreads(state);
+                wxPyEndBlockThreads();

                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }
                 return NULL;
             }
             list->Append((wxObject*) new wxRealPoint(*wxo));
         }
     }

-    wxPyEndBlockThreads(state);
+    wxPyEndBlockThreads();

     return list;
 }
 
     return list;
 }
 


@@ -229,10 +229,11 @@ static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 
         return NULL;
 {
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 
         return NULL;
 {

-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxOGLInitialize();
 
         wxOGLInitialize();
 

-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -246,10 +247,11 @@ static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 
         return NULL;
 {
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 
         return NULL;
 {

-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxOGLCleanUp();
 
         wxOGLCleanUp();
 

-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;