Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed (again) how the Python global interpreter lock is handled as

Browse Source 
well as the Python thread state.  This time it works on SMP machines
without barfing and is also still compatible with Python debuggers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-12-19 21:25:11 +00:00
parent 706b3c8ce4
commit 4268f79856
61 changed files with 11940 additions and 9961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wxPython/contrib/ogl/ogl.cpp
View File

@@ -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) {
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++) {
@@ -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);
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++) {
@@ -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");
wxPyEndBlockThreads(state);
wxPyEndBlockThreads();
return NULL;
}
list->Append((wxObject*) new wxRealPoint(*wxo));
}
}
wxPyEndBlockThreads(state);
wxPyEndBlockThreads();
return list;
}
@@ -229,10 +229,11 @@ static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxOGLInitialize();
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} 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;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxOGLCleanUp();
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;

20
wxPython/contrib/ogl/ogl.i
View File

@@ -139,17 +139,17 @@ void wxOGLCleanUp();
// 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++) {
@@ -160,29 +160,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);
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++) {
@@ -201,13 +201,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");
wxPyEndBlockThreads(state);
wxPyEndBlockThreads();
return NULL;
}
list->Append((wxObject*) new wxRealPoint(*wxo));
}
}
wxPyEndBlockThreads(state);
wxPyEndBlockThreads();
return list;
}

1155
wxPython/contrib/ogl/oglbasic.cpp
View File

File diff suppressed because it is too large Load Diff

250
wxPython/contrib/ogl/oglcanvas.cpp
View File

@@ -121,10 +121,11 @@ static PyObject *_wrap_new_wxDiagram(PyObject *self, PyObject *args, PyObject *k
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxDiagram",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDiagram *)new_wxDiagram();
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxDiagram_p");
_resultobj = Py_BuildValue("s",_ptemp);
@@ -171,10 +172,11 @@ static PyObject *_wrap_wxDiagram_AddShape(PyObject *self, PyObject *args, PyObje
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_AddShape(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -207,10 +209,11 @@ static PyObject *_wrap_wxDiagram_Clear(PyObject *self, PyObject *args, PyObject
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_Clear(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -234,10 +237,11 @@ static PyObject *_wrap_wxDiagram_DeleteAllShapes(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_DeleteAllShapes(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -274,10 +278,11 @@ static PyObject *_wrap_wxDiagram_DrawOutline(PyObject *self, PyObject *args, PyO
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_DrawOutline(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -303,10 +308,11 @@ static PyObject *_wrap_wxDiagram_FindShape(PyObject *self, PyObject *args, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyShape *)wxDiagram_FindShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
return _resultobj;
}
@@ -330,10 +336,11 @@ static PyObject *_wrap_wxDiagram_GetCanvas(PyObject *self, PyObject *args, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyShapeCanvas *)wxDiagram_GetCanvas(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -357,10 +364,11 @@ static PyObject *_wrap_wxDiagram_GetCount(PyObject *self, PyObject *args, PyObje
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxDiagram_GetCount(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -384,10 +392,11 @@ static PyObject *_wrap_wxDiagram_GetGridSpacing(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (double )wxDiagram_GetGridSpacing(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("d",_result);
return _resultobj;
}
@@ -411,10 +420,11 @@ static PyObject *_wrap_wxDiagram_GetMouseTolerance(PyObject *self, PyObject *arg
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxDiagram_GetMouseTolerance(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -441,10 +451,11 @@ static PyObject *_wrap_wxDiagram_GetShapeList(PyObject *self, PyObject *args, Py
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (PyObject *)wxDiagram_GetShapeList(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
_resultobj = _result;
}
@@ -470,10 +481,11 @@ static PyObject *_wrap_wxDiagram_GetQuickEditMode(PyObject *self, PyObject *args
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDiagram_GetQuickEditMode(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -497,10 +509,11 @@ static PyObject *_wrap_wxDiagram_GetSnapToGrid(PyObject *self, PyObject *args, P
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDiagram_GetSnapToGrid(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -532,10 +545,11 @@ static PyObject *_wrap_wxDiagram_InsertShape(PyObject *self, PyObject *args, PyO
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_InsertShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -580,10 +594,11 @@ static PyObject *_wrap_wxDiagram_LoadFile(PyObject *self, PyObject *args, PyObje
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDiagram_LoadFile(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
@@ -619,10 +634,11 @@ static PyObject *_wrap_wxDiagram_ReadContainerGeometry(PyObject *self, PyObject
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_ReadContainerGeometry(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -655,10 +671,11 @@ static PyObject *_wrap_wxDiagram_ReadLines(PyObject *self, PyObject *args, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_ReadLines(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -691,10 +708,11 @@ static PyObject *_wrap_wxDiagram_ReadNodes(PyObject *self, PyObject *args, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_ReadNodes(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -727,10 +745,11 @@ static PyObject *_wrap_wxDiagram_RecentreAll(PyObject *self, PyObject *args, PyO
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_RecentreAll(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -763,10 +782,11 @@ static PyObject *_wrap_wxDiagram_Redraw(PyObject *self, PyObject *args, PyObject
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_Redraw(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -790,10 +810,11 @@ static PyObject *_wrap_wxDiagram_RemoveAllShapes(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_RemoveAllShapes(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -826,10 +847,11 @@ static PyObject *_wrap_wxDiagram_RemoveShape(PyObject *self, PyObject *args, PyO
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_RemoveShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -874,10 +896,11 @@ static PyObject *_wrap_wxDiagram_SaveFile(PyObject *self, PyObject *args, PyObje
#endif
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDiagram_SaveFile(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
@@ -913,10 +936,11 @@ static PyObject *_wrap_wxDiagram_SetCanvas(PyObject *self, PyObject *args, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_SetCanvas(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -941,10 +965,11 @@ static PyObject *_wrap_wxDiagram_SetGridSpacing(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_SetGridSpacing(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -969,10 +994,11 @@ static PyObject *_wrap_wxDiagram_SetMouseTolerance(PyObject *self, PyObject *arg
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_SetMouseTolerance(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -999,10 +1025,11 @@ static PyObject *_wrap_wxDiagram_SetQuickEditMode(PyObject *self, PyObject *args
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_SetQuickEditMode(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1029,10 +1056,11 @@ static PyObject *_wrap_wxDiagram_SetSnapToGrid(PyObject *self, PyObject *args, P
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_SetSnapToGrid(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1059,10 +1087,11 @@ static PyObject *_wrap_wxDiagram_ShowAll(PyObject *self, PyObject *args, PyObjec
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_ShowAll(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1100,10 +1129,11 @@ static PyObject *_wrap_wxDiagram_Snap(PyObject *self, PyObject *args, PyObject *
_arg2 = &temp0;
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxDiagram_Snap(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
@@ -1199,10 +1229,11 @@ static PyObject *_wrap_new_wxPyShapeCanvas(PyObject *self, PyObject *args, PyObj
return NULL;
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyShapeCanvas *)new_wxPyShapeCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyShapeCanvas_p");
_resultobj = Py_BuildValue("s",_ptemp);
@@ -1241,10 +1272,11 @@ static PyObject *_wrap_wxPyShapeCanvas__setCallbackInfo(PyObject *self, PyObject
_arg2 = _obj2;
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas__setCallbackInfo(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1286,10 +1318,11 @@ static PyObject *_wrap_wxPyShapeCanvas_AddShape(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_AddShape(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1339,10 +1372,11 @@ static PyObject *_wrap_wxPyShapeCanvas_FindShape(PyObject *self, PyObject *args,
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyShape *)wxPyShapeCanvas_FindShape(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
{
PyObject *o;
@@ -1379,10 +1413,11 @@ static PyObject *_wrap_wxPyShapeCanvas_FindFirstSensitiveShape(PyObject *self, P
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyShape *)wxPyShapeCanvas_FindFirstSensitiveShape(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxShapeEvtHandler(_result); }
{
PyObject *o;
@@ -1411,10 +1446,11 @@ static PyObject *_wrap_wxPyShapeCanvas_GetDiagram(PyObject *self, PyObject *args
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxDiagram *)wxPyShapeCanvas_GetDiagram(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1438,10 +1474,11 @@ static PyObject *_wrap_wxPyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxPyShapeCanvas_GetQuickEditMode(_arg0);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -1473,10 +1510,11 @@ static PyObject *_wrap_wxPyShapeCanvas_InsertShape(PyObject *self, PyObject *arg
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_InsertShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1503,10 +1541,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyOb
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnBeginDragLeft(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1533,10 +1572,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyO
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnBeginDragRight(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1563,10 +1603,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObje
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnEndDragLeft(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1593,10 +1634,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObj
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnEndDragRight(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1626,10 +1668,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1659,10 +1702,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnDragRight(PyObject *self, PyObject
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnDragRight(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1689,10 +1733,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnLeftClick(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1719,10 +1764,11 @@ static PyObject *_wrap_wxPyShapeCanvas_base_OnRightClick(PyObject *self, PyObjec
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_base_OnRightClick(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1755,10 +1801,11 @@ static PyObject *_wrap_wxPyShapeCanvas_Redraw(PyObject *self, PyObject *args, Py
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_Redraw(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1791,10 +1838,11 @@ static PyObject *_wrap_wxPyShapeCanvas_RemoveShape(PyObject *self, PyObject *arg
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_RemoveShape(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1827,10 +1875,11 @@ static PyObject *_wrap_wxPyShapeCanvas_SetDiagram(PyObject *self, PyObject *args
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_SetDiagram(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1868,10 +1917,11 @@ static PyObject *_wrap_wxPyShapeCanvas_Snap(PyObject *self, PyObject *args, PyOb
_arg2 = &temp0;
}
{
wxPy_BEGIN_ALLOW_THREADS;
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShapeCanvas_Snap(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{

1695
wxPython/contrib/ogl/oglshapes.cpp
View File

File diff suppressed because it is too large Load Diff

1075
wxPython/contrib/ogl/oglshapes2.cpp
View File

File diff suppressed because it is too large Load Diff