X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/794c5cb151d633aa13a4f74292713544c6ccf381..c0fbf24ba6abc81db66ead334d69af670a8ec5a7:/wxPython/src/msw/sizers.cpp diff --git a/wxPython/src/msw/sizers.cpp b/wxPython/src/msw/sizers.cpp index a61b0aa9c1..83224a09b0 100644 --- a/wxPython/src/msw/sizers.cpp +++ b/wxPython/src/msw/sizers.cpp @@ -57,25 +57,8 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" -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; -} +#include + static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -106,7 +89,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { #if PYTHON_API_VERSION >= 1009 static char* wxStringErrorMsg = "String or Unicode type required"; #else - static char* wxStringErrorMsg = "string type is required for parameter"; + static char* wxStringErrorMsg = "String type required"; #endif class wxPySizer : public wxSizer { @@ -127,6 +110,72 @@ IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer); #ifdef __cplusplus extern "C" { #endif +static void *SwigwxSizerItemTowxObject(void *ptr) { + wxSizerItem *src; + wxObject *dest; + src = (wxSizerItem *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +#define wxSizerItem_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) +static PyObject *_wrap_wxSizerItem_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_DeleteWindows",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_DeleteWindows. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSizerItem_DeleteWindows(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizerItem_GetPosition(_swigobj) (_swigobj->GetPosition()) +static PyObject *_wrap_wxSizerItem_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetPosition",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_GetPosition. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxPoint (wxSizerItem_GetPosition(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxSizerItem_GetSize(_swigobj) (_swigobj->GetSize()) static PyObject *_wrap_wxSizerItem_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -147,10 +196,11 @@ static PyObject *_wrap_wxSizerItem_GetSize(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxSizerItem_GetSize(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -176,10 +226,11 @@ static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxSizerItem_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -219,10 +270,11 @@ static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *self, PyObject *args, return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetDimension(_arg0,*_arg1,*_arg2); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -248,10 +300,11 @@ static PyObject *_wrap_wxSizerItem_SetRatioWH(PyObject *self, PyObject *args, Py } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetRatioWH(_arg0,_arg1,_arg2); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -283,10 +336,11 @@ static PyObject *_wrap_wxSizerItem_SetRatioSize(PyObject *self, PyObject *args, return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetRatioSize(_arg0,*_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -311,10 +365,11 @@ static PyObject *_wrap_wxSizerItem_SetRatio(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetRatio(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -339,10 +394,11 @@ static PyObject *_wrap_wxSizerItem_GetRatio(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (float )wxSizerItem_GetRatio(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("f",_result); return _resultobj; } @@ -366,10 +422,11 @@ static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizerItem_IsWindow(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -393,10 +450,11 @@ static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizerItem_IsSizer(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -420,10 +478,11 @@ static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizerItem_IsSpacer(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -435,7 +494,6 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO wxSizerItem * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetWindow",_kwnames,&_argo0)) @@ -448,17 +506,12 @@ static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxWindow *)wxSizerItem_GetWindow(_arg0); - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -489,10 +542,11 @@ static PyObject *_wrap_wxSizerItem_SetWindow(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetWindow(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -505,7 +559,6 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb wxSizerItem * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetSizer",_kwnames,&_argo0)) @@ -518,17 +571,12 @@ static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxSizer *)wxSizerItem_GetSizer(_arg0); - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizer_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxSizer(_result); } return _resultobj; } @@ -559,10 +607,11 @@ static PyObject *_wrap_wxSizerItem_SetSizer(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetSizer(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -587,10 +636,11 @@ static PyObject *_wrap_wxSizerItem_GetOption(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxSizerItem_GetOption(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -614,10 +664,11 @@ static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxSizerItem_GetFlag(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -641,10 +692,11 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxSizerItem_GetBorder(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -669,10 +721,11 @@ static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetInitSize(_arg0,_arg1,_arg2); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -697,10 +750,11 @@ static PyObject *_wrap_wxSizerItem_SetOption(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetOption(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -725,10 +779,11 @@ static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetFlag(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -753,10 +808,11 @@ static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *self, PyObject *args, PyO } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizerItem_SetBorder(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -790,16 +846,60 @@ static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (PyObject *)wxSizerItem_GetUserData(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } return _resultobj; } +static void *SwigwxSizerTowxObject(void *ptr) { + wxSizer *src; + wxObject *dest; + src = (wxSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + +static void wxSizer__setOORInfo(wxSizer *self,PyObject * _self) { + self->SetClientObject(new wxPyClientData(_self)); + } +static PyObject *_wrap_wxSizer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + PyObject * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","_self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer__setOORInfo",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__setOORInfo. Expected _wxSizer_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSizer__setOORInfo(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void wxSizer_Destroy(wxSizer *self) { delete self; } static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -818,10 +918,11 @@ static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_Destroy(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -867,10 +968,11 @@ static PyObject *_wrap_wxSizer_AddWindow(PyObject *self, PyObject *args, PyObjec _arg5 = _obj5; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_AddWindow(_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; @@ -916,10 +1018,11 @@ static PyObject *_wrap_wxSizer_AddSizer(PyObject *self, PyObject *args, PyObject _arg5 = _obj5; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_AddSizer(_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; @@ -958,10 +1061,11 @@ static PyObject *_wrap_wxSizer_AddSpacer(PyObject *self, PyObject *args, PyObjec _arg6 = _obj6; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_AddSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1008,10 +1112,11 @@ static PyObject *_wrap_wxSizer_InsertWindow(PyObject *self, PyObject *args, PyOb _arg6 = _obj6; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_InsertWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1058,10 +1163,11 @@ static PyObject *_wrap_wxSizer_InsertSizer(PyObject *self, PyObject *args, PyObj _arg6 = _obj6; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_InsertSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1101,10 +1207,11 @@ static PyObject *_wrap_wxSizer_InsertSpacer(PyObject *self, PyObject *args, PyOb _arg7 = _obj7; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_InsertSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1150,10 +1257,11 @@ static PyObject *_wrap_wxSizer_PrependWindow(PyObject *self, PyObject *args, PyO _arg5 = _obj5; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_PrependWindow(_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; @@ -1199,10 +1307,11 @@ static PyObject *_wrap_wxSizer_PrependSizer(PyObject *self, PyObject *args, PyOb _arg5 = _obj5; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_PrependSizer(_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; @@ -1241,10 +1350,11 @@ static PyObject *_wrap_wxSizer_PrependSpacer(PyObject *self, PyObject *args, PyO _arg6 = _obj6; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_PrependSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1278,10 +1388,11 @@ static PyObject *_wrap_wxSizer_RemoveWindow(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizer_RemoveWindow(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1314,10 +1425,11 @@ static PyObject *_wrap_wxSizer_RemoveSizer(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizer_RemoveSizer(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1342,10 +1454,11 @@ static PyObject *_wrap_wxSizer_RemovePos(PyObject *self, PyObject *args, PyObjec } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (bool )wxSizer_RemovePos(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1372,10 +1485,11 @@ static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetDimension(_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; @@ -1407,10 +1521,11 @@ static PyObject *_wrap_wxSizer_SetMinSize(PyObject *self, PyObject *args, PyObje return NULL; } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetMinSize(_arg0,*_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1445,10 +1560,11 @@ static PyObject *_wrap_wxSizer_SetItemMinSizeWindow(PyObject *self, PyObject *ar } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetItemMinSizeWindow(_arg0,_arg1,_arg2,_arg3); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1483,10 +1599,11 @@ static PyObject *_wrap_wxSizer_SetItemMinSizeSizer(PyObject *self, PyObject *arg } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetItemMinSizeSizer(_arg0,_arg1,_arg2,_arg3); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1513,10 +1630,11 @@ static PyObject *_wrap_wxSizer_SetItemMinSizePos(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetItemMinSizePos(_arg0,_arg1,_arg2,_arg3); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1542,10 +1660,11 @@ static PyObject *_wrap_wxSizer_GetSize(PyObject *self, PyObject *args, PyObject } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxSizer_GetSize(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1571,10 +1690,11 @@ static PyObject *_wrap_wxSizer_GetPosition(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxPoint (wxSizer_GetPosition(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1600,10 +1720,11 @@ static PyObject *_wrap_wxSizer_GetMinSize(PyObject *self, PyObject *args, PyObje } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxSizer_GetMinSize(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1627,10 +1748,11 @@ static PyObject *_wrap_wxSizer_Layout(PyObject *self, PyObject *args, PyObject * } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_Layout(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1663,10 +1785,11 @@ static PyObject *_wrap_wxSizer_Fit(PyObject *self, PyObject *args, PyObject *kwa } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_Fit(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1699,10 +1822,70 @@ static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxSizer_SetSizeHints(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_Clear(_swigobj,_swigarg0) (_swigobj->Clear(_swigarg0)) +static PyObject *_wrap_wxSizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + bool _arg1 = (bool ) FALSE; + PyObject * _argo0 = 0; + int tempbool1 = (int) FALSE; + char *_kwnames[] = { "self","delete_windows", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxSizer_Clear",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_Clear. Expected _wxSizer_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSizer_Clear(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_DeleteWindows(_swigobj) (_swigobj->DeleteWindows()) +static PyObject *_wrap_wxSizer_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_DeleteWindows",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer_DeleteWindows. Expected _wxSizer_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxSizer_DeleteWindows(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1730,10 +1913,11 @@ static PyObject *_wrap_wxSizer_GetChildren(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (PyObject *)wxSizer_GetChildren(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; }{ _resultobj = _result; } @@ -1748,6 +1932,14 @@ static void *SwigwxPySizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxPySizerTowxObject(void *ptr) { + wxPySizer *src; + wxObject *dest; + src = (wxPySizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxPySizer() (new wxPySizer()) static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1759,10 +1951,11 @@ static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPySizer",_kwnames)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxPySizer *)new_wxPySizer(); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxPySizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1773,8 +1966,8 @@ static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *k return _resultobj; } -#define wxPySizer__setSelf(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setSelf(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPySizer__setCallbackInfo(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setCallbackInfo(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPySizer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPySizer * _arg0; PyObject * _arg1; @@ -1785,12 +1978,12 @@ static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObje char *_kwnames[] = { "self","self","_class", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPySizer__setSelf",_kwnames,&_argo0,&_obj1,&_obj2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPySizer__setCallbackInfo",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPySizer_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPySizer__setSelf. Expected _wxPySizer_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPySizer__setCallbackInfo. Expected _wxPySizer_p."); return NULL; } } @@ -1801,10 +1994,11 @@ static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObje _arg2 = _obj2; } { - wxPy_BEGIN_ALLOW_THREADS; - wxPySizer__setSelf(_arg0,_arg1,_arg2); + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxPySizer__setCallbackInfo(_arg0,_arg1,_arg2); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1818,6 +2012,14 @@ static void *SwigwxBoxSizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxBoxSizerTowxObject(void *ptr) { + wxBoxSizer *src; + wxObject *dest; + src = (wxBoxSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxBoxSizer(_swigarg0) (new wxBoxSizer(_swigarg0)) static PyObject *_wrap_new_wxBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1830,10 +2032,11 @@ static PyObject *_wrap_new_wxBoxSizer(PyObject *self, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:new_wxBoxSizer",_kwnames,&_arg0)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxBoxSizer *)new_wxBoxSizer(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxBoxSizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1863,10 +2066,11 @@ static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxBoxSizer_GetOrientation(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -1889,10 +2093,11 @@ static PyObject *_wrap_wxBoxSizer_RecalcSizes(PyObject *self, PyObject *args, Py } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxBoxSizer_RecalcSizes(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1918,10 +2123,11 @@ static PyObject *_wrap_wxBoxSizer_CalcMin(PyObject *self, PyObject *args, PyObje } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxBoxSizer_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1943,6 +2149,14 @@ static void *SwigwxStaticBoxSizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxStaticBoxSizerTowxObject(void *ptr) { + wxStaticBoxSizer *src; + wxObject *dest; + src = (wxStaticBoxSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxStaticBoxSizer(_swigarg0,_swigarg1) (new wxStaticBoxSizer(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1964,10 +2178,11 @@ static PyObject *_wrap_new_wxStaticBoxSizer(PyObject *self, PyObject *args, PyOb } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxStaticBoxSizer *)new_wxStaticBoxSizer(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBoxSizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -1985,7 +2200,6 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *a wxStaticBoxSizer * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticBoxSizer_GetStaticBox",_kwnames,&_argo0)) @@ -1998,17 +2212,12 @@ static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *a } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxStaticBox *)wxStaticBoxSizer_GetStaticBox(_arg0); - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBox_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -2030,10 +2239,11 @@ static PyObject *_wrap_wxStaticBoxSizer_RecalcSizes(PyObject *self, PyObject *ar } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxStaticBoxSizer_RecalcSizes(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2059,10 +2269,11 @@ static PyObject *_wrap_wxStaticBoxSizer_CalcMin(PyObject *self, PyObject *args, } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxStaticBoxSizer_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2076,6 +2287,14 @@ static void *SwigwxNotebookSizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxNotebookSizerTowxObject(void *ptr) { + wxNotebookSizer *src; + wxObject *dest; + src = (wxNotebookSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxNotebookSizer(_swigarg0) (new wxNotebookSizer(_swigarg0)) static PyObject *_wrap_new_wxNotebookSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2096,10 +2315,11 @@ static PyObject *_wrap_new_wxNotebookSizer(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxNotebookSizer *)new_wxNotebookSizer(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebookSizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -2128,10 +2348,11 @@ static PyObject *_wrap_wxNotebookSizer_RecalcSizes(PyObject *self, PyObject *arg } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxNotebookSizer_RecalcSizes(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2157,10 +2378,11 @@ static PyObject *_wrap_wxNotebookSizer_CalcMin(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxNotebookSizer_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2173,7 +2395,6 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg wxNotebookSizer * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookSizer_GetNotebook",_kwnames,&_argo0)) @@ -2186,17 +2407,12 @@ static PyObject *_wrap_wxNotebookSizer_GetNotebook(PyObject *self, PyObject *arg } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxNotebook *)wxNotebookSizer_GetNotebook(_arg0); - wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxNotebook_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } return _resultobj; } @@ -2208,6 +2424,14 @@ static void *SwigwxGridSizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxGridSizerTowxObject(void *ptr) { + wxGridSizer *src; + wxObject *dest; + src = (wxGridSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) static PyObject *_wrap_new_wxGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2223,10 +2447,11 @@ static PyObject *_wrap_new_wxGridSizer(PyObject *self, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxGridSizer",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxGridSizer *)new_wxGridSizer(_arg0,_arg1,_arg2,_arg3); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridSizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -2255,10 +2480,11 @@ static PyObject *_wrap_wxGridSizer_RecalcSizes(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridSizer_RecalcSizes(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2284,10 +2510,11 @@ static PyObject *_wrap_wxGridSizer_CalcMin(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxGridSizer_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2312,10 +2539,11 @@ static PyObject *_wrap_wxGridSizer_SetCols(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridSizer_SetCols(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2340,10 +2568,11 @@ static PyObject *_wrap_wxGridSizer_SetRows(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridSizer_SetRows(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2368,10 +2597,11 @@ static PyObject *_wrap_wxGridSizer_SetVGap(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridSizer_SetVGap(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2396,10 +2626,11 @@ static PyObject *_wrap_wxGridSizer_SetHGap(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxGridSizer_SetHGap(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2424,10 +2655,11 @@ static PyObject *_wrap_wxGridSizer_GetCols(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxGridSizer_GetCols(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2451,10 +2683,11 @@ static PyObject *_wrap_wxGridSizer_GetRows(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxGridSizer_GetRows(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2478,10 +2711,11 @@ static PyObject *_wrap_wxGridSizer_GetVGap(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxGridSizer_GetVGap(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2505,10 +2739,11 @@ static PyObject *_wrap_wxGridSizer_GetHGap(PyObject *self, PyObject *args, PyObj } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (int )wxGridSizer_GetHGap(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -2529,6 +2764,14 @@ static void *SwigwxFlexGridSizerTowxSizer(void *ptr) { return (void *) dest; } +static void *SwigwxFlexGridSizerTowxObject(void *ptr) { + wxFlexGridSizer *src; + wxObject *dest; + src = (wxFlexGridSizer *) ptr; + dest = (wxObject *) src; + return (void *) dest; +} + #define new_wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxFlexGridSizer(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) static PyObject *_wrap_new_wxFlexGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2544,10 +2787,11 @@ static PyObject *_wrap_new_wxFlexGridSizer(PyObject *self, PyObject *args, PyObj if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiii:new_wxFlexGridSizer",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) return NULL; { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = (wxFlexGridSizer *)new_wxFlexGridSizer(_arg0,_arg1,_arg2,_arg3); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } if (_result) { SWIG_MakePtr(_ptemp, (char *) _result,"_wxFlexGridSizer_p"); _resultobj = Py_BuildValue("s",_ptemp); @@ -2576,10 +2820,11 @@ static PyObject *_wrap_wxFlexGridSizer_RecalcSizes(PyObject *self, PyObject *arg } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFlexGridSizer_RecalcSizes(_arg0); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2605,10 +2850,11 @@ static PyObject *_wrap_wxFlexGridSizer_CalcMin(PyObject *self, PyObject *args, P } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); _result = new wxSize (wxFlexGridSizer_CalcMin(_arg0)); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -2633,10 +2879,11 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableRow(PyObject *self, PyObject * } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFlexGridSizer_AddGrowableRow(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2661,10 +2908,11 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableRow(PyObject *self, PyObjec } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFlexGridSizer_RemoveGrowableRow(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2689,10 +2937,11 @@ static PyObject *_wrap_wxFlexGridSizer_AddGrowableCol(PyObject *self, PyObject * } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFlexGridSizer_AddGrowableCol(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2717,10 +2966,11 @@ static PyObject *_wrap_wxFlexGridSizer_RemoveGrowableCol(PyObject *self, PyObjec } } { - wxPy_BEGIN_ALLOW_THREADS; + PyThreadState* __tstate = wxPyBeginAllowThreads(); wxFlexGridSizer_RemoveGrowableCol(_arg0,_arg1); - wxPy_END_ALLOW_THREADS; + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; } Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2757,9 +3007,11 @@ static PyMethodDef sizerscMethods[] = { { "wxBoxSizer_RecalcSizes", (PyCFunction) _wrap_wxBoxSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS }, { "wxBoxSizer_GetOrientation", (PyCFunction) _wrap_wxBoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS }, { "new_wxBoxSizer", (PyCFunction) _wrap_new_wxBoxSizer, METH_VARARGS | METH_KEYWORDS }, - { "wxPySizer__setSelf", (PyCFunction) _wrap_wxPySizer__setSelf, METH_VARARGS | METH_KEYWORDS }, + { "wxPySizer__setCallbackInfo", (PyCFunction) _wrap_wxPySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS }, { "new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_DeleteWindows", (PyCFunction) _wrap_wxSizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_Clear", (PyCFunction) _wrap_wxSizer_Clear, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_SetSizeHints", (PyCFunction) _wrap_wxSizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Fit", (PyCFunction) _wrap_wxSizer_Fit, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Layout", (PyCFunction) _wrap_wxSizer_Layout, METH_VARARGS | METH_KEYWORDS }, @@ -2784,6 +3036,7 @@ static PyMethodDef sizerscMethods[] = { { "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS }, { "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS }, @@ -2806,6 +3059,8 @@ static PyMethodDef sizerscMethods[] = { { "wxSizerItem_SetDimension", (PyCFunction) _wrap_wxSizerItem_SetDimension, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_CalcMin", (PyCFunction) _wrap_wxSizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS }, { "wxSizerItem_GetSize", (PyCFunction) _wrap_wxSizerItem_GetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetPosition", (PyCFunction) _wrap_wxSizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_DeleteWindows", (PyCFunction) _wrap_wxSizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus @@ -2815,15 +3070,7 @@ static PyMethodDef sizerscMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { - { "_wxAcceleratorTable","_class_wxAcceleratorTable",0}, - { "_wxEvent","_class_wxEvent",0}, - { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, - { "_wxMenuEvent","_class_wxMenuEvent",0}, - { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, - { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, - { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, - { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, @@ -2833,60 +3080,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxCustomDataObject","_wxCustomDataObject",0}, - { "_wxSpinCtrl","_class_wxSpinCtrl",0}, - { "_class_wxRegionIterator","_wxRegionIterator",0}, - { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, - { "_class_wxMenuBar","_wxMenuBar",0}, - { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, - { "_class_wxEvtHandler","_wxEvtHandler",0}, - { "_wxPaintEvent","_class_wxPaintEvent",0}, - { "_wxPySizer","_class_wxPySizer",0}, - { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, - { "_wxCursor","_class_wxCursor",0}, - { "_wxNotifyEvent","_class_wxNotifyEvent",0}, - { "_wxMask","_class_wxMask",0}, - { "_wxPen","_class_wxPen",0}, - { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, - { "_class_wxNotebookSizer","_wxNotebookSizer",0}, { "_byte","_unsigned_char",0}, - { "_wxDataObject","_class_wxDataObject",0}, - { "_wxStaticBox","_class_wxStaticBox",0}, - { "_wxColourDatabase","_class_wxColourDatabase",0}, - { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, - { "_wxPyDropSource","_class_wxPyDropSource",0}, - { "_wxChoice","_class_wxChoice",0}, - { "_wxSlider","_class_wxSlider",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_wxImageList","_class_wxImageList",0}, - { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, - { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, - { "_wxBitmapButton","_class_wxBitmapButton",0}, - { "_class_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_class_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_class_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_class_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_class_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_class_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_class_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_class_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_class_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_class_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_class_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer}, - { "_class_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer}, - { "_class_wxSizer","_wxSizer",0}, - { "_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, { "_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, - { "_wxGridSizer","_class_wxGridSizer",0}, - { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, - { "_class_wxClipboard","_wxClipboard",0}, - { "_class_wxGauge","_wxGauge",0}, - { "_wxDC","_class_wxDC",0}, - { "_wxSizerItem","_class_wxSizerItem",0}, - { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, - { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, - { "_wxSpinEvent","_class_wxSpinEvent",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -2894,33 +3091,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}, - { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, - { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, - { "_class_wxMenuItem","_wxMenuItem",0}, - { "_class_wxPaintEvent","_wxPaintEvent",0}, - { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, - { "_class_wxPySizer","_wxPySizer",0}, - { "_wxPanel","_class_wxPanel",0}, - { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, - { "_wxCheckBox","_class_wxCheckBox",0}, - { "_wxPyEvent","_class_wxPyEvent",0}, - { "_wxTextCtrl","_class_wxTextCtrl",0}, - { "_class_wxMask","_wxMask",0}, - { "_wxTextDataObject","_class_wxTextDataObject",0}, - { "_class_wxKeyEvent","_wxKeyEvent",0}, - { "_wxColour","_class_wxColour",0}, - { "_class_wxDialog","_wxDialog",0}, - { "_class_wxFileDataObject","_wxFileDataObject",0}, - { "_wxIdleEvent","_class_wxIdleEvent",0}, - { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, - { "_class_wxDataObject","_wxDataObject",0}, - { "_wxStaticLine","_class_wxStaticLine",0}, - { "_wxBrush","_class_wxBrush",0}, - { "_wxToggleButton","_class_wxToggleButton",0}, - { "_wxDataFormat","_class_wxDataFormat",0}, - { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, - { "_wxShowEvent","_class_wxShowEvent",0}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -2929,122 +3099,37 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxPyValidator","_class_wxPyValidator",0}, - { "_class_wxEvent","_wxEvent",0}, - { "_wxCheckListBox","_class_wxCheckListBox",0}, - { "_wxRect","_class_wxRect",0}, - { "_wxCommandEvent","_class_wxCommandEvent",0}, - { "_wxSizeEvent","_class_wxSizeEvent",0}, - { "_wxPoint","_class_wxPoint",0}, - { "_class_wxButton","_wxButton",0}, - { "_wxRadioBox","_class_wxRadioBox",0}, - { "_class_wxSpinCtrl","_wxSpinCtrl",0}, - { "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, - { "_wxBoxSizer","_class_wxBoxSizer",0}, { "_char","_wxChar",0}, - { "_wxBitmap","_class_wxBitmap",0}, - { "_wxPenList","_class_wxPenList",0}, - { "_wxWindowDC","_class_wxWindowDC",0}, - { "_wxTimerEvent","_class_wxTimerEvent",0}, - { "_wxScrollBar","_class_wxScrollBar",0}, - { "_wxSpinButton","_class_wxSpinButton",0}, - { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, - { "_class_wxNotifyEvent","_wxNotifyEvent",0}, - { "_class_wxValidator","_wxValidator",0}, - { "_class_wxPyEvent","_wxPyEvent",0}, - { "_class_wxIconizeEvent","_wxIconizeEvent",0}, - { "_class_wxStaticBitmap","_wxStaticBitmap",0}, - { "_wxDropTarget","_class_wxDropTarget",0}, - { "_class_wxStaticLine","_wxStaticLine",0}, - { "_class_wxColourDatabase","_wxColourDatabase",0}, - { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, - { "_class_wxRegion","_wxRegion",0}, - { "_class_wxDataFormat","_wxDataFormat",0}, - { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, - { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_wxStaticText","_class_wxStaticText",0}, - { "_wxFont","_class_wxFont",0}, - { "_class_wxPyDropTarget","_wxPyDropTarget",0}, - { "_wxCloseEvent","_class_wxCloseEvent",0}, { "_unsigned_long","_long",0}, - { "_class_wxRect","_wxRect",0}, - { "_class_wxDC","_wxDC",0}, - { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, - { "_class_wxBrushList","_wxBrushList",0}, - { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, - { "_class_wxPenList","_wxPenList",0}, - { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, - { "_wxFocusEvent","_class_wxFocusEvent",0}, - { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, - { "_class_wxTimerEvent","_wxTimerEvent",0}, - { "_class_wxSpinButton","_wxSpinButton",0}, - { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, - { "_class_wxPanel","_wxPanel",0}, - { "_class_wxCheckBox","_wxCheckBox",0}, - { "_wxComboBox","_class_wxComboBox",0}, - { "_wxRadioButton","_class_wxRadioButton",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTextCtrl","_wxTextCtrl",0}, - { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, - { "_wxMetaFileDC","_class_wxMetaFileDC",0}, - { "_class_wxTextDataObject","_wxTextDataObject",0}, - { "_wxMenu","_class_wxMenu",0}, - { "_class_wxMoveEvent","_wxMoveEvent",0}, - { "_wxListBox","_class_wxListBox",0}, - { "_wxScreenDC","_class_wxScreenDC",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, - { "_class_wxDropTarget","_wxDropTarget",0}, - { "_class_wxBrush","_wxBrush",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_wxWindow",0}, - { "_class_wxStaticText","_wxStaticText",0}, - { "_class_wxFont","_wxFont",0}, - { "_wxClipboard","_class_wxClipboard",0}, - { "_class_wxPyValidator","_wxPyValidator",0}, - { "_class_wxCloseEvent","_wxCloseEvent",0}, - { "_wxBusyInfo","_class_wxBusyInfo",0}, - { "_wxFontList","_class_wxFontList",0}, - { "_class_wxMenuEvent","_wxMenuEvent",0}, - { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0}, - { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, - { "_wxClientDC","_class_wxClientDC",0}, - { "_wxMouseEvent","_class_wxMouseEvent",0}, - { "_class_wxPoint","_wxPoint",0}, - { "_wxRealPoint","_class_wxRealPoint",0}, - { "_class_wxRadioBox","_wxRadioBox",0}, - { "_class_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, - { "_class_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, - { "_class_wxBoxSizer","_wxBoxSizer",0}, + { "_wxObject","_wxFlexGridSizer",SwigwxFlexGridSizerTowxObject}, + { "_wxObject","_wxGridSizer",SwigwxGridSizerTowxObject}, + { "_wxObject","_wxNotebookSizer",SwigwxNotebookSizerTowxObject}, + { "_wxObject","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxObject}, + { "_wxObject","_wxBoxSizer",SwigwxBoxSizerTowxObject}, + { "_wxObject","_wxPySizer",SwigwxPySizerTowxObject}, + { "_wxObject","_wxSizer",SwigwxSizerTowxObject}, + { "_wxObject","_wxSizerItem",SwigwxSizerItemTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_wxMemoryDC","_class_wxMemoryDC",0}, - { "_wxPyTextDataObject","_class_wxPyTextDataObject",0}, - { "_wxPaintDC","_class_wxPaintDC",0}, - { "_class_wxWindowDC","_wxWindowDC",0}, - { "_class_wxFocusEvent","_wxFocusEvent",0}, - { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, - { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, - { "_class_wxCursor","_wxCursor",0}, - { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, - { "_wxScrolledWindow","_class_wxScrolledWindow",0}, { "_unsigned_char","_byte",0}, - { "_class_wxMetaFileDC","_wxMetaFileDC",0}, - { "_class_wxMenu","_wxMenu",0}, - { "_wxControl","_class_wxControl",0}, - { "_class_wxListBox","_wxListBox",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, { "_unsigned_int","_time_t",0}, @@ -3052,25 +3137,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, - { "_wxIcon","_class_wxIcon",0}, - { "_wxDialog","_class_wxDialog",0}, - { "_class_wxPen","_wxPen",0}, { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_class_wxStaticBox","_wxStaticBox",0}, - { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0}, - { "_class_wxPyDropSource","_wxPyDropSource",0}, - { "_class_wxScrollEvent","_wxScrollEvent",0}, - { "_wxJoystickEvent","_class_wxJoystickEvent",0}, - { "_class_wxChoice","_wxChoice",0}, - { "_class_wxSlider","_wxSlider",0}, - { "_class_wxImageList","_wxImageList",0}, - { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_class_wxGridSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, - { "_class_wxGridSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxGridSizer}, - { "_class_wxGridSizer","_wxGridSizer",0}, - { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -3080,8 +3149,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_int",0}, { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, - { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, - { "_class_wxSizerItem","_wxSizerItem",0}, { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, { "_int","_time_t",0}, @@ -3091,10 +3158,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_wxWindowID",0}, { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, - { "_class_wxMouseEvent","_wxMouseEvent",0}, - { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, - { "_class_wxSpinEvent","_wxSpinEvent",0}, - { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, { "_time_t","_wxCoord",0}, { "_time_t","_wxPrintQuality",0}, { "_time_t","_unsigned_int",0}, @@ -3102,28 +3165,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}, - { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, - { "_wxButton","_class_wxButton",0}, - { "_wxSize","_class_wxSize",0}, - { "_wxRegionIterator","_class_wxRegionIterator",0}, - { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, - { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, - { "_class_wxPaintDC","_wxPaintDC",0}, - { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, - { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0}, - { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, - { "_class_wxComboBox","_wxComboBox",0}, - { "_class_wxRadioButton","_wxRadioButton",0}, - { "_wxValidator","_class_wxValidator",0}, - { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, - { "_wxIconizeEvent","_class_wxIconizeEvent",0}, - { "_class_wxControl","_wxControl",0}, - { "_wxStaticBitmap","_class_wxStaticBitmap",0}, - { "_class_wxIcon","_wxIcon",0}, - { "_class_wxColour","_wxColour",0}, - { "_class_wxScreenDC","_wxScreenDC",0}, - { "_wxPalette","_class_wxPalette",0}, - { "_class_wxIdleEvent","_wxIdleEvent",0}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -3133,54 +3174,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEraseEvent","_class_wxEraseEvent",0}, - { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, - { "_class_wxJoystickEvent","_wxJoystickEvent",0}, - { "_class_wxToggleButton","_wxToggleButton",0}, - { "_wxRegion","_class_wxRegion",0}, - { "_wxSizer","_class_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, { "_wxSizer","_wxFlexGridSizer",SwigwxFlexGridSizerTowxSizer}, - { "_wxSizer","_class_wxGridSizer",SwigwxGridSizerTowxSizer}, { "_wxSizer","_wxGridSizer",SwigwxGridSizerTowxSizer}, - { "_wxSizer","_class_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, { "_wxSizer","_wxNotebookSizer",SwigwxNotebookSizerTowxSizer}, - { "_wxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, { "_wxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxSizer}, - { "_wxSizer","_class_wxBoxSizer",SwigwxBoxSizerTowxSizer}, { "_wxSizer","_wxBoxSizer",SwigwxBoxSizerTowxSizer}, - { "_wxSizer","_class_wxPySizer",SwigwxPySizerTowxSizer}, { "_wxSizer","_wxPySizer",SwigwxPySizerTowxSizer}, - { "_wxSizer","_class_wxSizer",0}, - { "_class_wxShowEvent","_wxShowEvent",0}, - { "_wxPyDropTarget","_class_wxPyDropTarget",0}, - { "_wxActivateEvent","_class_wxActivateEvent",0}, - { "_wxGauge","_class_wxGauge",0}, - { "_class_wxCheckListBox","_wxCheckListBox",0}, - { "_class_wxBusyInfo","_wxBusyInfo",0}, - { "_class_wxFontList","_wxFontList",0}, - { "_class_wxCommandEvent","_wxCommandEvent",0}, - { "_class_wxClientDC","_wxClientDC",0}, - { "_class_wxSizeEvent","_wxSizeEvent",0}, - { "_wxBrushList","_class_wxBrushList",0}, - { "_wxCustomDataObject","_class_wxCustomDataObject",0}, - { "_class_wxSize","_wxSize",0}, - { "_class_wxBitmap","_wxBitmap",0}, - { "_class_wxMemoryDC","_wxMemoryDC",0}, - { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0}, - { "_wxMenuBar","_class_wxMenuBar",0}, - { "_wxEvtHandler","_class_wxEvtHandler",0}, - { "_wxMenuItem","_class_wxMenuItem",0}, - { "_class_wxScrollBar","_wxScrollBar",0}, - { "_class_wxScrolledWindow","_wxScrolledWindow",0}, - { "_wxKeyEvent","_class_wxKeyEvent",0}, - { "_wxMoveEvent","_class_wxMoveEvent",0}, - { "_class_wxPalette","_wxPalette",0}, - { "_wxFileDataObject","_class_wxFileDataObject",0}, - { "_wxNotebookSizer","_class_wxNotebookSizer",0}, - { "_class_wxEraseEvent","_wxEraseEvent",0}, - { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, - { "_wxWindow","_class_wxWindow",0}, - { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, {0,0,0}}; static PyObject *SWIG_globals;