X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..e195c8c95fb154d035bab400952fc81c62439549:/wxPython/src/msw/misc.cpp diff --git a/wxPython/src/msw/misc.cpp b/wxPython/src/msw/misc.cpp index 1d5157532f..15e9210546 100644 --- a/wxPython/src/msw/misc.cpp +++ b/wxPython/src/msw/misc.cpp @@ -60,25 +60,6 @@ extern PyObject *SWIG_newvarlink(void); #include #include -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyList_Check(target)) { - o2 = target; - target = PyList_New(0); - PyList_Append(target, o2); - Py_XDECREF(o2); - } - PyList_Append(target,o); - Py_XDECREF(o); - } - return target; -} static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -180,6 +161,7 @@ static PyObject *_wrap_wxIntersectRect(PyObject *self, PyObject *args, PyObject _result = (PyObject *)wxIntersectRect(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -199,6 +181,7 @@ static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args, PyObject *kwargs) _result = (long )wxNewId(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -216,6 +199,7 @@ static PyObject *_wrap_wxRegisterId(PyObject *self, PyObject *args, PyObject *kw wxRegisterId(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -234,6 +218,7 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) { _result = (long )wxNewId(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -251,6 +236,7 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwar wxRegisterId(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -269,6 +255,7 @@ static PyObject *_wrap_wxGetCurrentId(PyObject *self, PyObject *args, PyObject * _result = (long )wxGetCurrentId(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -285,6 +272,7 @@ static PyObject *_wrap_wxBell(PyObject *self, PyObject *args, PyObject *kwargs) wxBell(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -302,6 +290,7 @@ static PyObject *_wrap_wxEndBusyCursor(PyObject *self, PyObject *args, PyObject wxEndBusyCursor(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -323,6 +312,7 @@ static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args, PyObject _result = (long )wxGetElapsedTime(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -340,6 +330,7 @@ static PyObject *_wrap_wxGetFreeMemory(PyObject *self, PyObject *args, PyObject _result = (long )wxGetFreeMemory(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -366,6 +357,7 @@ static PyObject *_wrap_wxGetMousePosition(PyObject *self, PyObject *args, PyObje wxGetMousePosition(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; { @@ -394,6 +386,7 @@ static PyObject *_wrap_wxIsBusy(PyObject *self, PyObject *args, PyObject *kwargs _result = (bool )wxIsBusy(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -411,6 +404,7 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args, PyObject *kwargs) { _result = new wxString (wxNow()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -454,6 +448,7 @@ static PyObject *_wrap_wxShell(PyObject *self, PyObject *args, PyObject *kwargs) _result = (bool )wxShell(*_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { if (_obj0) @@ -474,6 +469,7 @@ static PyObject *_wrap_wxStartTimer(PyObject *self, PyObject *args, PyObject *kw wxStartTimer(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -502,6 +498,7 @@ static PyObject *_wrap_wxGetOsVersion(PyObject *self, PyObject *args, PyObject * _result = (int )wxGetOsVersion(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); { PyObject *o; @@ -529,6 +526,7 @@ static PyObject *_wrap_wxGetOsDescription(PyObject *self, PyObject *args, PyObje _result = new wxString (wxGetOsDescription()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -551,6 +549,7 @@ static PyObject *_wrap_wxSleep(PyObject *self, PyObject *args, PyObject *kwargs) wxSleep(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -569,6 +568,7 @@ static PyObject *_wrap_wxUsleep(PyObject *self, PyObject *args, PyObject *kwargs wxUsleep(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -587,6 +587,7 @@ static PyObject *_wrap_wxYield(PyObject *self, PyObject *args, PyObject *kwargs) _result = (bool )wxYield(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -604,6 +605,7 @@ static PyObject *_wrap_wxYieldIfNeeded(PyObject *self, PyObject *args, PyObject _result = (bool )wxYieldIfNeeded(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -623,6 +625,7 @@ static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args, P wxEnableTopLevelWindows(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -644,6 +647,7 @@ static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args, PyObject *k _result = (char *)wxGetResource(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("s", _result); return _resultobj; } @@ -681,6 +685,7 @@ static PyObject *_wrap_wxStripMenuCodes(PyObject *self, PyObject *args, PyObject _result = new wxString (wxStripMenuCodes(*_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -707,6 +712,7 @@ static PyObject *_wrap_wxGetEmailAddress(PyObject *self, PyObject *args, PyObjec _result = new wxString (wxGetEmailAddress()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -729,6 +735,7 @@ static PyObject *_wrap_wxGetHostName(PyObject *self, PyObject *args, PyObject *k _result = new wxString (wxGetHostName()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -751,6 +758,7 @@ static PyObject *_wrap_wxGetFullHostName(PyObject *self, PyObject *args, PyObjec _result = new wxString (wxGetFullHostName()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -773,6 +781,7 @@ static PyObject *_wrap_wxGetUserId(PyObject *self, PyObject *args, PyObject *kwa _result = new wxString (wxGetUserId()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -795,6 +804,7 @@ static PyObject *_wrap_wxGetUserName(PyObject *self, PyObject *args, PyObject *k _result = new wxString (wxGetUserName()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -817,6 +827,7 @@ static PyObject *_wrap_wxGetHomeDir(PyObject *self, PyObject *args, PyObject *kw _result = new wxString (wxGetHomeDir()); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } @@ -860,6 +871,7 @@ static PyObject *_wrap_wxGetAccelFromString(PyObject *self, PyObject *args, PyOb _result = (wxAcceleratorEntry *)wxGetAccelFromString(*_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -914,6 +926,7 @@ static PyObject *_wrap_wxObject_GetClassName(PyObject *self, PyObject *args, PyO _result = (char *)wxObject_GetClassName(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("s", _result); return _resultobj; } @@ -942,6 +955,7 @@ static PyObject *_wrap_wxObject_Destroy(PyObject *self, PyObject *args, PyObject wxObject_Destroy(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -970,6 +984,7 @@ static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args, PyObject *kw _result = (long )wxSize_x_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -996,6 +1011,7 @@ static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args, PyObject *kw _result = (long )wxSize_x_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1023,6 +1039,7 @@ static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args, PyObject *kw _result = (long )wxSize_y_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1049,6 +1066,7 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args, PyObject *kw _result = (long )wxSize_y_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1070,6 +1088,7 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args, PyObject *kwar _result = (wxSize *)new_wxSize(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1101,6 +1120,7 @@ static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args, PyObject *k delete_wxSize(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1129,6 +1149,7 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args, PyObject *kwar wxSize_Set(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1156,6 +1177,7 @@ static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args, PyObject *kwa _result = (long )wxSize_GetX(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1182,6 +1204,7 @@ static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args, PyObject *kwa _result = (long )wxSize_GetY(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1208,6 +1231,7 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args, PyObject _result = (long )wxSize_GetWidth(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1234,6 +1258,7 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args, PyObject _result = (long )wxSize_GetHeight(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1260,6 +1285,7 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args, PyObject wxSize_SetWidth(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1287,6 +1313,7 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args, PyObject wxSize_SetHeight(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1319,12 +1346,52 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args, PyObject * _result = (PyObject *)wxSize_asTuple(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } return _resultobj; } +static int wxSize___cmp__(wxSize *self,const wxSize * sz) { + if (! sz) return 1; + if (*self == *sz) return 0; + return -1; + } +static PyObject *_wrap_wxSize___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxSize * _arg0; + wxSize * _arg1; + wxSize temp; + PyObject * _obj0 = 0; + wxSize temp0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","sz", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize___cmp__",_kwnames,&_obj0,&_obj1)) + return NULL; +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) + return NULL; +} +{ + _arg1 = &temp0; + if (! wxSize_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxSize___cmp__(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxRealPoint_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval) static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1348,6 +1415,7 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args, PyObjec _result = (double )wxRealPoint_x_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("d",_result); return _resultobj; } @@ -1374,6 +1442,7 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args, PyObjec _result = (double )wxRealPoint_x_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("d",_result); return _resultobj; } @@ -1401,6 +1470,7 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args, PyObjec _result = (double )wxRealPoint_y_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("d",_result); return _resultobj; } @@ -1427,6 +1497,7 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args, PyObjec _result = (double )wxRealPoint_y_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("d",_result); return _resultobj; } @@ -1448,6 +1519,7 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args, PyObject _result = (wxRealPoint *)new_wxRealPoint(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxRealPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1479,6 +1551,7 @@ static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args, PyObje delete_wxRealPoint(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1510,6 +1583,7 @@ static PyObject *_wrap_wxRealPoint_Set(PyObject *self, PyObject *args, PyObject wxRealPoint_Set(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1542,6 +1616,7 @@ static PyObject *_wrap_wxRealPoint_asTuple(PyObject *self, PyObject *args, PyObj _result = (PyObject *)wxRealPoint_asTuple(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -1582,6 +1657,7 @@ static PyObject *_wrap_wxRealPoint___add__(PyObject *self, PyObject *args, PyObj _result = new wxRealPoint (wxRealPoint___add__(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxRealPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1621,14 +1697,16 @@ static PyObject *_wrap_wxRealPoint___sub__(PyObject *self, PyObject *args, PyObj _result = new wxRealPoint (wxRealPoint___sub__(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxRealPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } static int wxRealPoint___cmp__(wxRealPoint *self,const wxRealPoint * p) { - if (! p) return 0; - return *self == *p; + if (! p) return 1; + if (*self == *p) return 0; + return -1; } static PyObject *_wrap_wxRealPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1659,6 +1737,7 @@ static PyObject *_wrap_wxRealPoint___cmp__(PyObject *self, PyObject *args, PyObj _result = (int )wxRealPoint___cmp__(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1686,6 +1765,7 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args, PyObject *k _result = (long )wxPoint_x_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1712,6 +1792,7 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args, PyObject *k _result = (long )wxPoint_x_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1739,6 +1820,7 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args, PyObject *k _result = (long )wxPoint_y_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1765,6 +1847,7 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args, PyObject *k _result = (long )wxPoint_y_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("l",_result); return _resultobj; } @@ -1786,6 +1869,7 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args, PyObject *kwa _result = (wxPoint *)new_wxPoint(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1817,6 +1901,7 @@ static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args, PyObject * delete_wxPoint(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1848,6 +1933,7 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args, PyObject *kwa wxPoint_Set(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1880,6 +1966,7 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject _result = (PyObject *)wxPoint_asTuple(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -1920,6 +2007,7 @@ static PyObject *_wrap_wxPoint___add__(PyObject *self, PyObject *args, PyObject _result = new wxPoint (wxPoint___add__(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1959,14 +2047,16 @@ static PyObject *_wrap_wxPoint___sub__(PyObject *self, PyObject *args, PyObject _result = new wxPoint (wxPoint___sub__(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } static int wxPoint___cmp__(wxPoint *self,const wxPoint * p) { - if (! p) return 0; - return *self == *p; + if (! p) return 1; + if (*self == *p) return 0; + return -1; } static PyObject *_wrap_wxPoint___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1997,6 +2087,7 @@ static PyObject *_wrap_wxPoint___cmp__(PyObject *self, PyObject *args, PyObject _result = (int )wxPoint___cmp__(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2020,6 +2111,7 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwar _result = (wxRect *)new_wxRect(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -2051,6 +2143,7 @@ static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args, PyObject *k delete_wxRect(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2078,6 +2171,7 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwa _result = (int )wxRect_GetX(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2104,6 +2198,7 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwa wxRect_SetX(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2131,6 +2226,7 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwa _result = (int )wxRect_GetY(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2157,6 +2253,7 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwa wxRect_SetY(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2184,6 +2281,7 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_GetWidth(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2210,6 +2308,7 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject wxRect_SetWidth(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2237,6 +2336,7 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_GetHeight(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2263,6 +2363,7 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args, PyObject wxRect_SetHeight(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2291,6 +2392,7 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args, PyObje _result = new wxPoint (wxRect_GetPosition(_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2319,6 +2421,7 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args, PyObject * _result = new wxSize (wxRect_GetSize(_arg0)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2346,6 +2449,7 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject * _result = (int )wxRect_GetLeft(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2372,6 +2476,7 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *k _result = (int )wxRect_GetTop(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2398,6 +2503,7 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_GetBottom(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2424,6 +2530,7 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_GetRight(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2450,6 +2557,7 @@ static PyObject *_wrap_wxRect_SetLeft(PyObject *self, PyObject *args, PyObject * wxRect_SetLeft(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2477,6 +2585,7 @@ static PyObject *_wrap_wxRect_SetRight(PyObject *self, PyObject *args, PyObject wxRect_SetRight(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2504,6 +2613,7 @@ static PyObject *_wrap_wxRect_SetTop(PyObject *self, PyObject *args, PyObject *k wxRect_SetTop(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2531,6 +2641,7 @@ static PyObject *_wrap_wxRect_SetBottom(PyObject *self, PyObject *args, PyObject wxRect_SetBottom(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2559,6 +2670,7 @@ static PyObject *_wrap_wxRect_Inflate(PyObject *self, PyObject *args, PyObject * wxRect_Inflate(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2588,6 +2700,7 @@ static PyObject *_wrap_wxRect_Inside(PyObject *self, PyObject *args, PyObject *k _result = (bool )wxRect_Inside(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2615,6 +2728,7 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kw _result = (int )wxRect_x_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2641,6 +2755,7 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kw _result = (int )wxRect_x_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2668,6 +2783,7 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kw _result = (int )wxRect_y_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2694,6 +2810,7 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kw _result = (int )wxRect_y_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2721,6 +2838,7 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_width_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2747,6 +2865,7 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject _result = (int )wxRect_width_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2774,6 +2893,7 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObjec _result = (int )wxRect_height_set(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2800,6 +2920,7 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObjec _result = (int )wxRect_height_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2833,6 +2954,7 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args, PyObject * _result = (PyObject *)wxRect_asTuple(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -2873,14 +2995,16 @@ static PyObject *_wrap_wxRect___add__(PyObject *self, PyObject *args, PyObject * _result = new wxRect (wxRect___add__(_arg0,_arg1)); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } static int wxRect___cmp__(wxRect *self,const wxRect * rect) { - if (! rect) return 0; - return *self == *rect; + if (! rect) return 1; + if (*self == *rect) return 0; + return -1; } static PyObject *_wrap_wxRect___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2911,6 +3035,7 @@ static PyObject *_wrap_wxRect___cmp__(PyObject *self, PyObject *args, PyObject * _result = (int )wxRect___cmp__(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2955,6 +3080,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObje wxIndividualLayoutConstraint_Above(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2983,6 +3109,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO wxIndividualLayoutConstraint_Absolute(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3010,6 +3137,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObjec wxIndividualLayoutConstraint_AsIs(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3047,6 +3175,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje wxIndividualLayoutConstraint_Below(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3074,6 +3203,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self wxIndividualLayoutConstraint_Unconstrained(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3111,6 +3241,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObj wxIndividualLayoutConstraint_LeftOf(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3149,6 +3280,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, Py wxIndividualLayoutConstraint_PercentOf(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3186,6 +3318,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyOb wxIndividualLayoutConstraint_RightOf(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3224,6 +3357,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObj wxIndividualLayoutConstraint_SameAs(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3264,6 +3398,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject wxIndividualLayoutConstraint_Set(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3292,6 +3427,7 @@ static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args, P _result = (wxLayoutConstraints *)new_wxLayoutConstraints(); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxLayoutConstraints_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3326,6 +3462,7 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject * _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_bottom_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3360,6 +3497,7 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreX_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3394,6 +3532,7 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_centreY_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3428,6 +3567,7 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject * _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_height_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3462,6 +3602,7 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_left_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3496,6 +3637,7 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_right_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3530,6 +3672,7 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_top_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3564,6 +3707,7 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a _result = (wxIndividualLayoutConstraint *)wxLayoutConstraints_width_get(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxIndividualLayoutConstraint_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3592,6 +3736,7 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args, Py _result = (wxAcceleratorEntry *)new_wxAcceleratorEntry(_arg0,_arg1,_arg2); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorEntry_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3624,6 +3769,7 @@ static PyObject *_wrap_delete_wxAcceleratorEntry(PyObject *self, PyObject *args, delete_wxAcceleratorEntry(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3654,6 +3800,7 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args, Py wxAcceleratorEntry_Set(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3682,6 +3829,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *arg _result = (int )wxAcceleratorEntry_GetFlags(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -3709,6 +3857,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *a _result = (int )wxAcceleratorEntry_GetKeyCode(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -3736,6 +3885,7 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *a _result = (int )wxAcceleratorEntry_GetCommand(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -3781,6 +3931,7 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args, Py _result = (wxAcceleratorTable *)new_wxAcceleratorTable(_arg0,_arg1); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxAcceleratorTable_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3816,6 +3967,7 @@ static PyObject *_wrap_delete_wxAcceleratorTable(PyObject *self, PyObject *args, delete_wxAcceleratorTable(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3864,6 +4016,7 @@ static PyObject *_wrap_new_wxBusyInfo(PyObject *self, PyObject *args, PyObject * _result = (wxBusyInfo *)new_wxBusyInfo(*_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxBusyInfo_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -3900,6 +4053,7 @@ static PyObject *_wrap_delete_wxBusyInfo(PyObject *self, PyObject *args, PyObjec delete_wxBusyInfo(_arg0); wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -3990,6 +4144,7 @@ static PyMethodDef misccMethods[] = { { "wxRealPoint_y_set", (PyCFunction) _wrap_wxRealPoint_y_set, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint_x_get", (PyCFunction) _wrap_wxRealPoint_x_get, METH_VARARGS | METH_KEYWORDS }, { "wxRealPoint_x_set", (PyCFunction) _wrap_wxRealPoint_x_set, METH_VARARGS | METH_KEYWORDS }, + { "wxSize___cmp__", (PyCFunction) _wrap_wxSize___cmp__, METH_VARARGS | METH_KEYWORDS }, { "wxSize_asTuple", (PyCFunction) _wrap_wxSize_asTuple, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS }, { "wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS }, @@ -4050,7 +4205,6 @@ static PyMethodDef misccMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { - { "_wxAcceleratorTable","_class_wxAcceleratorTable",0}, { "_signed_long","_long",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, @@ -4061,20 +4215,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, - { "_class_wxObject","_class_wxBusyInfo",SwigwxBusyInfoTowxObject}, - { "_class_wxObject","_wxBusyInfo",SwigwxBusyInfoTowxObject}, - { "_class_wxObject","_class_wxAcceleratorTable",SwigwxAcceleratorTableTowxObject}, - { "_class_wxObject","_wxAcceleratorTable",SwigwxAcceleratorTableTowxObject}, - { "_class_wxObject","_class_wxLayoutConstraints",SwigwxLayoutConstraintsTowxObject}, - { "_class_wxObject","_wxLayoutConstraints",SwigwxLayoutConstraintsTowxObject}, - { "_class_wxObject","_class_wxIndividualLayoutConstraint",SwigwxIndividualLayoutConstraintTowxObject}, - { "_class_wxObject","_wxIndividualLayoutConstraint",SwigwxIndividualLayoutConstraintTowxObject}, - { "_class_wxObject","_wxObject",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -4082,7 +4225,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_class_wxRealPoint","_wxRealPoint",0}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -4091,44 +4233,29 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxRect","_class_wxRect",0}, - { "_wxPoint","_class_wxPoint",0}, { "_char","_wxChar",0}, - { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, - { "_class_wxRect","_wxRect",0}, - { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_wxBusyInfo","_class_wxBusyInfo",0}, - { "_wxObject","_class_wxBusyInfo",SwigwxBusyInfoTowxObject}, { "_wxObject","_wxBusyInfo",SwigwxBusyInfoTowxObject}, - { "_wxObject","_class_wxAcceleratorTable",SwigwxAcceleratorTableTowxObject}, { "_wxObject","_wxAcceleratorTable",SwigwxAcceleratorTableTowxObject}, - { "_wxObject","_class_wxLayoutConstraints",SwigwxLayoutConstraintsTowxObject}, { "_wxObject","_wxLayoutConstraints",SwigwxLayoutConstraintsTowxObject}, - { "_wxObject","_class_wxIndividualLayoutConstraint",SwigwxIndividualLayoutConstraintTowxObject}, { "_wxObject","_wxIndividualLayoutConstraint",SwigwxIndividualLayoutConstraintTowxObject}, - { "_wxObject","_class_wxObject",0}, - { "_class_wxPoint","_wxPoint",0}, - { "_wxRealPoint","_class_wxRealPoint",0}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, @@ -4165,8 +4292,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, - { "_wxSize","_class_wxSize",0}, - { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -4176,8 +4301,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_class_wxBusyInfo","_wxBusyInfo",0}, - { "_class_wxSize","_wxSize",0}, {0,0,0}}; static PyObject *SWIG_globals;