return target;
}
-#if PYTHON_API_VERSION >= 1009
- static char* wxStringErrorMsg = "String or Unicode type required";
-#else
- static char* wxStringErrorMsg = "String type required";
-#endif
-
//---------------------------------------------------------------------------
// This one will work for any class for the VERY generic cases, but beyond that
// 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.");
- 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");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
for (int x=0; x<count; x++) {
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);
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return list;
}
//---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
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");
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return NULL;
}
for (int x=0; x<count; x++) {
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));
}
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
return list;
}
// already be a pointer to a Python object that we can use
// in the OOR data.
wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source;
- wxPyClientData* data = (wxPyClientData*)seh->GetClientObject();
+ wxPyOORClientData* data = (wxPyOORClientData*)seh->GetClientObject();
if (data) {
target = data->m_obj;
Py_INCREF(target);
if (! target) {
target = wxPyMake_wxObject2(source, FALSE);
if (target != Py_None)
- ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyClientData(target));
+ ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
}
return target;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames))
return NULL;
{
- wxPy_BEGIN_ALLOW_THREADS;
- wxOGLInitialize();
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ wxOGLInitialize();
- wxPy_END_ALLOW_THREADS;
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames))
return NULL;
{
- wxPy_BEGIN_ALLOW_THREADS;
- wxOGLCleanUp();
+ PyThreadState* __tstate = wxPyBeginAllowThreads();
+ wxOGLCleanUp();
- wxPy_END_ALLOW_THREADS;
+ wxPyEndAllowThreads(__tstate);
+ if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;