From 37f6a9770cfeb5b5cf088f5c728331088c49d68a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 30 Sep 1999 22:28:18 +0000 Subject: [PATCH] gernerated source code updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/gtk/cmndlgs.cpp | 97 +- utils/wxPython/src/gtk/controls.cpp | 623 +++++----- utils/wxPython/src/gtk/controls.py | 5 + utils/wxPython/src/gtk/controls2.cpp | 155 ++- utils/wxPython/src/gtk/events.cpp | 343 +++++- utils/wxPython/src/gtk/events.py | 51 +- utils/wxPython/src/gtk/frames.cpp | 77 +- utils/wxPython/src/gtk/gdi.cpp | 27 +- utils/wxPython/src/gtk/image.cpp | 11 - utils/wxPython/src/gtk/mdi.cpp | 77 +- utils/wxPython/src/gtk/misc.cpp | 938 +++++++------- utils/wxPython/src/gtk/misc.py | 6 + utils/wxPython/src/gtk/misc2.cpp | 15 +- utils/wxPython/src/gtk/printfw.cpp | 137 +-- utils/wxPython/src/gtk/sizers.cpp | 1692 ++++++++++++++++++++++++++ utils/wxPython/src/gtk/sizers.py | 229 ++++ utils/wxPython/src/gtk/stattool.cpp | 92 +- utils/wxPython/src/gtk/windows.cpp | 1053 +++++++++++++--- utils/wxPython/src/gtk/windows.py | 86 ++ utils/wxPython/src/gtk/windows2.cpp | 107 +- utils/wxPython/src/gtk/windows3.cpp | 153 ++- utils/wxPython/src/gtk/wx.cpp | 36 +- utils/wxPython/src/gtk/wx.py | 91 +- 23 files changed, 4530 insertions(+), 1571 deletions(-) create mode 100644 utils/wxPython/src/gtk/sizers.cpp create mode 100644 utils/wxPython/src/gtk/sizers.py diff --git a/utils/wxPython/src/gtk/cmndlgs.cpp b/utils/wxPython/src/gtk/cmndlgs.cpp index 9f8b46a71a..90c090b565 100644 --- a/utils/wxPython/src/gtk/cmndlgs.cpp +++ b/utils/wxPython/src/gtk/cmndlgs.cpp @@ -106,17 +106,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -545,12 +534,13 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject long _arg3 = (long ) 0; wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition; PyObject * _argo0 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","message","defaultPath","style","pos", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sslO:new_wxDirDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sslO:new_wxDirDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -559,13 +549,12 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDirDialog. Expected _wxPoint_p."); + if (_obj4) +{ + _arg4 = &temp; + if (! wxPoint_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxDirDialog *)new_wxDirDialog(_arg0,_arg1,_arg2,_arg3,*_arg4); @@ -823,12 +812,13 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject long _arg5 = (long ) 0; wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition; PyObject * _argo0 = 0; - PyObject * _argo6 = 0; + wxPoint temp; + PyObject * _obj6 = 0; char *_kwnames[] = { "parent","message","defaultDir","defaultFile","wildcard","style","pos", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sssslO:new_wxFileDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sssslO:new_wxFileDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -837,13 +827,12 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo6) { - if (_argo6 == Py_None) { _arg6 = NULL; } - else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxFileDialog. Expected _wxPoint_p."); + if (_obj6) +{ + _arg6 = &temp; + if (! wxPoint_helper(_obj6, &_arg6)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxFileDialog *)new_wxFileDialog(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6); @@ -1407,12 +1396,13 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, PyObject * _obj1 = 0; PyObject * _obj2 = 0; PyObject * _obj4 = 0; - PyObject * _argo6 = 0; + wxPoint temp; + PyObject * _obj6 = 0; char *_kwnames[] = { "parent","message","caption","LIST","style","pos", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxSingleChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_argo6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxSingleChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_obj6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1442,13 +1432,12 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, return NULL; } } - if (_argo6) { - if (_argo6 == Py_None) { _arg6 = NULL; } - else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSingleChoiceDialog. Expected _wxPoint_p."); + if (_obj6) +{ + _arg6 = &temp; + if (! wxPoint_helper(_obj6, &_arg6)) return NULL; - } - } +} { if (_obj4) { _arg3 = PyList_Size(_obj4); @@ -1640,12 +1629,13 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyO long _arg4 = (long ) wxOK|wxCANCEL|wxCENTRE; wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition; PyObject * _argo0 = 0; - PyObject * _argo5 = 0; + wxPoint temp; + PyObject * _obj5 = 0; char *_kwnames[] = { "parent","message","caption","defaultValue","style","pos", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|sslO:new_wxTextEntryDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|sslO:new_wxTextEntryDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1654,13 +1644,12 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyO return NULL; } } - if (_argo5) { - if (_argo5 == Py_None) { _arg5 = NULL; } - else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTextEntryDialog. Expected _wxPoint_p."); + if (_obj5) +{ + _arg5 = &temp; + if (! wxPoint_helper(_obj5, &_arg5)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxTextEntryDialog *)new_wxTextEntryDialog(_arg0,_arg1,_arg2,_arg3,_arg4,*_arg5); @@ -2407,12 +2396,13 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObj long _arg3 = (long ) wxOK|wxCANCEL|wxCENTRE; wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition; PyObject * _argo0 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","message","caption","style","pos", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|slO:new_wxMessageDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|slO:new_wxMessageDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2421,13 +2411,12 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObj return NULL; } } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMessageDialog. Expected _wxPoint_p."); + if (_obj4) +{ + _arg4 = &temp; + if (! wxPoint_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxMessageDialog *)new_wxMessageDialog(_arg0,_arg1,_arg2,_arg3,*_arg4); @@ -2693,6 +2682,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -2804,6 +2794,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -2823,6 +2814,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_wxMessageDialog","_class_wxMessageDialog",0}, + { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, @@ -2906,6 +2898,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -2983,6 +2976,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -2992,6 +2986,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp index a68a2e517c..6e1fe4bca0 100644 --- a/utils/wxPython/src/gtk/controls.cpp +++ b/utils/wxPython/src/gtk/controls.cpp @@ -117,23 +117,27 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; wxValidator wxPyDefaultValidator; // Non-const default because of SWIG #ifdef __cplusplus extern "C" { #endif +static int _wrap_wxDefaultValidator_set(PyObject *val) { + + PyErr_SetString(PyExc_TypeError,"Variable wxDefaultValidator is read-only."); + return 1; +} + +static PyObject *_wrap_wxDefaultValidator_get() { + PyObject * pyobj; + char ptemp[128]; + + SWIG_MakePtr(ptemp,(char *) &wxDefaultValidator,"_wxValidator_p"); + pyobj = PyString_FromString(ptemp); + return pyobj; +} + static void *SwigwxControlTowxWindow(void *ptr) { wxControl *src; wxWindow *dest; @@ -260,14 +264,16 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kw char * _arg7 = (char *) "button"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxButton",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -283,20 +289,18 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kw } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxButton. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxButton. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -396,14 +400,16 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObje char * _arg7 = (char *) "button"; PyObject * _argo0 = 0; PyObject * _argo2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","bitmap","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxBitmapButton",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxBitmapButton",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -419,20 +425,18 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxBitmapButton. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxBitmapButton. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -777,14 +781,16 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject * char * _arg7 = (char *) "checkBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","label","pos","size","style","val","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxCheckBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxCheckBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -800,20 +806,18 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject * } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckBox. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxCheckBox. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -935,15 +939,17 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kw wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; char * _arg8 = (char *) "choice"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxChoice",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxChoice",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -952,20 +958,18 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kw return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxChoice. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxChoice. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_obj5) { _arg5 = wxString_LIST_helper(_obj5); @@ -1402,15 +1406,17 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject * wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator; char * _arg9 = (char *) "comboBox"; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _obj6 = 0; PyObject * _argo8 = 0; char *_kwnames[] = { "parent","id","value","pos","size","LIST","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOOlOs:new_wxComboBox",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_obj6,&_arg7,&_argo8,&_arg9)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOOlOs:new_wxComboBox",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_obj6,&_arg7,&_argo8,&_arg9)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1419,20 +1425,18 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxComboBox. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxComboBox. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_obj6) { _arg6 = wxString_LIST_helper(_obj6); @@ -2154,14 +2158,16 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwa wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; char * _arg7 = (char *) "gauge"; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","range","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|OOlOs:new_wxGauge",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|OOlOs:new_wxGauge",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2170,20 +2176,18 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwa return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGauge. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxGauge. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -2463,13 +2467,15 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject char * _arg6 = (char *) "staticBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2485,20 +2491,18 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBox. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBox. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxStaticBox *)new_wxStaticBox(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -2553,13 +2557,15 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject long _arg4 = (long ) wxLI_HORIZONTAL; char * _arg5 = (char *) "staticLine"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStaticLine",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStaticLine",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2568,20 +2574,18 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticLine. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticLine. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxStaticLine *)new_wxStaticLine(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -2634,13 +2638,15 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject char * _arg6 = (char *) "staticText"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticText",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticText",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2656,20 +2662,18 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticText. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticText. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxStaticText *)new_wxStaticText(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -2799,15 +2803,17 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; char * _arg8 = (char *) "listBox"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxListBox",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxListBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2816,20 +2822,18 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListBox. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListBox. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_obj5) { _arg5 = wxString_LIST_helper(_obj5); @@ -3097,6 +3101,54 @@ static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args, P return _resultobj; } +#define wxListBox_InsertItems(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->InsertItems(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxListBox_InsertItems(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxListBox * _arg0; + int _arg1; + wxString * _arg2; + int _arg3; + PyObject * _argo0 = 0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","LIST","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxListBox_InsertItems",_kwnames,&_argo0,&_obj2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListBox_InsertItems. Expected _wxListBox_p."); + return NULL; + } + } +{ + _arg2 = wxString_LIST_helper(_obj2); + if (_arg2 == NULL) { + return NULL; + } +} +{ + if (_obj2) { + _arg1 = PyList_Size(_obj2); + } + else { + _arg1 = 0; + } +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxListBox_InsertItems(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + delete [] _arg2; +} + return _resultobj; +} + #define wxListBox_GetString(_swigobj,_swigarg0) (_swigobj->GetString(_swigarg0)) static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3494,15 +3546,17 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObje wxValidator * _arg7 = (wxValidator *) &wxPyDefaultValidator; char * _arg8 = (char *) "listBox"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxCheckListBox",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxCheckListBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj5,&_arg6,&_argo7,&_arg8)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3511,20 +3565,18 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxCheckListBox. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckListBox. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_obj5) { _arg5 = wxString_LIST_helper(_obj5); @@ -3688,14 +3740,16 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject * wxValidator * _arg6 = (wxValidator *) &wxPyDefaultValidator; char * _arg7 = (char *) "text"; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","value","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOlOs:new_wxTextCtrl",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOlOs:new_wxTextCtrl",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3704,20 +3758,18 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTextCtrl. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxTextCtrl. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -4811,14 +4863,16 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator; char * _arg6 = (char *) "scrollBar"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _argo5 = 0; char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxScrollBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxScrollBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_argo5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4827,20 +4881,18 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrollBar. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrollBar. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_argo5) { if (_argo5 == Py_None) { _arg5 = NULL; } else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) { @@ -5068,13 +5120,15 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject long _arg4 = (long ) wxSP_HORIZONTAL; char * _arg5 = (char *) "spinButton"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxSpinButton",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxSpinButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5083,20 +5137,18 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSpinButton. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSpinButton. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxSpinButton *)new_wxSpinButton(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -5287,13 +5339,15 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObje char * _arg6 = (char *) "staticBitmap"; PyObject * _argo0 = 0; PyObject * _argo2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","bitmap","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBitmap",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBitmap",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5309,20 +5363,18 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticBitmap. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxStaticBitmap. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxStaticBitmap *)new_wxStaticBitmap(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -5486,15 +5538,17 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject * char * _arg10 = (char *) "radioBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _obj6 = 0; PyObject * _argo9 = 0; char *_kwnames[] = { "parent","id","label","point","size","LIST","majorDimension","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOOilOs:new_wxRadioBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOOilOs:new_wxRadioBox",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5510,20 +5564,18 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject * } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioBox. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioBox. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_obj6) { _arg6 = wxString_LIST_helper(_obj6); @@ -6029,14 +6081,16 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObjec char * _arg7 = (char *) "radioButton"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; PyObject * _argo6 = 0; char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxRadioButton",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxRadioButton",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_argo6,&_arg7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6052,20 +6106,18 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObjec } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxRadioButton. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxRadioButton. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} if (_argo6) { if (_argo6 == Py_None) { _arg6 = NULL; } else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxValidator_p")) { @@ -6188,14 +6240,16 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kw wxValidator * _arg8 = (wxValidator *) &wxPyDefaultValidator; char * _arg9 = (char *) "slider"; PyObject * _argo0 = 0; - PyObject * _argo5 = 0; - PyObject * _argo6 = 0; + wxPoint temp; + PyObject * _obj5 = 0; + wxSize temp0; + PyObject * _obj6 = 0; PyObject * _argo8 = 0; char *_kwnames[] = { "parent","id","value","minValue","maxValue","point","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|OOlOs:new_wxSlider",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_argo6,&_arg7,&_argo8,&_arg9)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|OOlOs:new_wxSlider",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_obj5,&_obj6,&_arg7,&_argo8,&_arg9)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6204,20 +6258,18 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kw return NULL; } } - if (_argo5) { - if (_argo5 == Py_None) { _arg5 = NULL; } - else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxSlider. Expected _wxPoint_p."); + if (_obj5) +{ + _arg5 = &temp; + if (! wxPoint_helper(_obj5, &_arg5)) return NULL; - } - } - if (_argo6) { - if (_argo6 == Py_None) { _arg6 = NULL; } - else if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of new_wxSlider. Expected _wxSize_p."); +} + if (_obj6) +{ + _arg6 = &temp0; + if (! wxSize_helper(_obj6, &_arg6)) return NULL; - } - } +} if (_argo8) { if (_argo8 == Py_None) { _arg8 = NULL; } else if (SWIG_GetPtrObj(_argo8,(void **) &_arg8,"_wxValidator_p")) { @@ -6867,6 +6919,7 @@ static PyMethodDef controlscMethods[] = { { "wxListBox_Number", (PyCFunction) _wrap_wxListBox_Number, METH_VARARGS | METH_KEYWORDS }, { "wxListBox_GetStringSelection", (PyCFunction) _wrap_wxListBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS }, { "wxListBox_GetString", (PyCFunction) _wrap_wxListBox_GetString, METH_VARARGS | METH_KEYWORDS }, + { "wxListBox_InsertItems", (PyCFunction) _wrap_wxListBox_InsertItems, METH_VARARGS | METH_KEYWORDS }, { "wxListBox_GetSelections", (PyCFunction) _wrap_wxListBox_GetSelections, METH_VARARGS | METH_KEYWORDS }, { "wxListBox_GetSelection", (PyCFunction) _wrap_wxListBox_GetSelection, METH_VARARGS | METH_KEYWORDS }, { "wxListBox_FindString", (PyCFunction) _wrap_wxListBox_FindString, METH_VARARGS | METH_KEYWORDS }, @@ -6953,6 +7006,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -7053,6 +7107,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -7070,6 +7125,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, @@ -7157,6 +7213,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -7253,6 +7310,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton}, { "_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton}, @@ -7264,6 +7322,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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","_class_wxSlider",SwigwxSliderTowxControl}, @@ -7421,6 +7480,8 @@ SWIGEXPORT(void) initcontrolsc() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("controlsc", controlscMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"cvar", SWIG_globals); + SWIG_addvarlink(SWIG_globals,"wxDefaultValidator",_wrap_wxDefaultValidator_get, _wrap_wxDefaultValidator_set); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/utils/wxPython/src/gtk/controls.py b/utils/wxPython/src/gtk/controls.py index ab4b2c42c9..699d4a4d20 100644 --- a/utils/wxPython/src/gtk/controls.py +++ b/utils/wxPython/src/gtk/controls.py @@ -349,6 +349,9 @@ class wxListBoxPtr(wxControlPtr): def GetSelections(self, *_args, **_kwargs): val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs) return val + def InsertItems(self, *_args, **_kwargs): + val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs) + return val def GetString(self, *_args, **_kwargs): val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs) return val @@ -770,3 +773,5 @@ class wxSlider(wxSliderPtr): #-------------- VARIABLE WRAPPERS ------------------ +cvar = controlsc.cvar +wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator) diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp index 14b31f2b64..889c56b1d3 100644 --- a/utils/wxPython/src/gtk/controls2.cpp +++ b/utils/wxPython/src/gtk/controls2.cpp @@ -54,6 +54,9 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "controls2c" #include "helpers.h" +#ifdef __WXMSW__ +#include +#endif #include #include @@ -104,17 +107,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; extern wxValidator wxPyDefaultValidator; @@ -1068,12 +1060,13 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *arg wxListEvent * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","m_pointDrag", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListEvent_m_pointDrag_set",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListEvent_m_pointDrag_set",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1082,13 +1075,11 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *arg return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_pointDrag_set. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxPoint *)wxListEvent_m_pointDrag_set(_arg0,_arg1); @@ -1251,14 +1242,16 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject * wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator; char * _arg6 = (char *) "listCtrl"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _argo5 = 0; char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlOs:new_wxListCtrl",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlOs:new_wxListCtrl",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_argo5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1267,20 +1260,18 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxListCtrl. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxListCtrl. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_argo5) { if (_argo5 == Py_None) { _arg5 = NULL; } else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) { @@ -1606,11 +1597,12 @@ static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args, wxPoint * _arg2; int _arg3; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","start","pt","direction", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlOi:wxListCtrl_FindItemAtPos",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlOi:wxListCtrl_FindItemAtPos",_kwnames,&_argo0,&_arg1,&_obj2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1619,13 +1611,11 @@ static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args, return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_FindItemAtPos. Expected _wxPoint_p."); +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxListCtrl_FindItemAtPos(_arg0,_arg1,*_arg2,_arg3); @@ -2123,14 +2113,15 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args, PyObje int * _arg2; int temp; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp0; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","point", NULL }; self = self; { _arg2 = &temp; } - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_HitTest",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_HitTest",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2139,13 +2130,11 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_HitTest. Expected _wxPoint_p."); +{ + _arg1 = &temp0; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxListCtrl_HitTest(_arg0,*_arg1,*_arg2); @@ -2702,11 +2691,12 @@ static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args long _arg1; wxPoint * _arg2; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","item","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_SetItemPosition",_kwnames,&_argo0,&_arg1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_SetItemPosition",_kwnames,&_argo0,&_arg1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2715,13 +2705,11 @@ static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxListCtrl_SetItemPosition. Expected _wxPoint_p."); +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxListCtrl_SetItemPosition(_arg0,_arg1,*_arg2); @@ -3307,14 +3295,16 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject * wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator; char * _arg6 = (char *) "wxTreeCtrl"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; PyObject * _argo5 = 0; char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxTreeCtrl",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxTreeCtrl",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_argo5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3323,20 +3313,18 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxTreeCtrl. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxTreeCtrl. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} if (_argo5) { if (_argo5 == Py_None) { _arg5 = NULL; } else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) { @@ -5491,12 +5479,13 @@ static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args, PyObje wxTreeCtrl * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","point", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_HitTest",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_HitTest",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5505,13 +5494,11 @@ static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxTreeItemId (wxTreeCtrl_HitTest(_arg0,*_arg1)); @@ -5695,6 +5682,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -5764,6 +5752,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_class_wxTreeEvent",SwigwxTreeEventTowxEvent}, { "_class_wxEvent","_wxTreeEvent",SwigwxTreeEventTowxEvent}, { "_class_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent}, @@ -5789,6 +5778,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, + { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, @@ -5842,6 +5832,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -5905,6 +5896,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxListEvent","_wxListEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, @@ -5916,6 +5908,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, + { "_wxValidator","_class_wxValidator",0}, { "_class_wxTreeItemId","_wxTreeItemId",0}, { "_wxTreeCtrl","_class_wxTreeCtrl",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, diff --git a/utils/wxPython/src/gtk/events.cpp b/utils/wxPython/src/gtk/events.cpp index feeb36d8f7..812cd3f30e 100644 --- a/utils/wxPython/src/gtk/events.cpp +++ b/utils/wxPython/src/gtk/events.cpp @@ -103,18 +103,89 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } +static char* wxStringErrorMsg = "string type is required for parameter"; + +class wxPyEvent : public wxEvent { + DECLARE_DYNAMIC_CLASS(wxPyEvent) +public: + wxPyEvent(int id=0, PyObject* userData = Py_None) + : wxEvent(id) { + m_userData = userData; + Py_INCREF(m_userData); + } -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); + ~wxPyEvent() { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_userData); + wxPySaveThread(doSave); + } + void SetPyData(PyObject* userData) { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_userData); + m_userData = userData; + Py_INCREF(m_userData); + wxPySaveThread(doSave); + } + + PyObject* GetPyData() const { + Py_INCREF(m_userData); + return m_userData; + } + + // This one is so the event object can be Cloned... + void CopyObject(wxObject& dest) const { + wxEvent::CopyObject(dest); + ((wxPyEvent*)&dest)->SetPyData(m_userData); + } + +private: + PyObject* m_userData; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent) + + +class wxPyCommandEvent : public wxCommandEvent { + DECLARE_DYNAMIC_CLASS(wxPyCommandEvent) +public: + wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0, PyObject* userData = Py_None) + : wxCommandEvent(commandType, id) { + m_userData = userData; + Py_INCREF(m_userData); + } + + ~wxPyCommandEvent() { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_userData); + wxPySaveThread(doSave); + } + + void SetPyData(PyObject* userData) { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_userData); + m_userData = userData; + Py_INCREF(m_userData); + wxPySaveThread(doSave); + } + + PyObject* GetPyData() const { + Py_INCREF(m_userData); + return m_userData; + } + + // This one is so the event object can be Cloned... + void CopyObject(wxObject& dest) const { + wxCommandEvent::CopyObject(dest); + ((wxPyCommandEvent*)&dest)->SetPyData(m_userData); + } + +private: + PyObject* m_userData; +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent) -static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { #endif @@ -2472,11 +2543,12 @@ static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *arg wxJoystickEvent * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxJoystickEvent_SetPosition",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxJoystickEvent_SetPosition",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2485,13 +2557,11 @@ static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *arg return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxJoystickEvent_SetPosition. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxJoystickEvent_SetPosition(_arg0,*_arg1); @@ -3150,14 +3220,76 @@ static void *SwigwxSysColourChangedEventTowxEvent(void *ptr) { return (void *) dest; } -static void *SwigwxPyEventTowxCommandEvent(void *ptr) { - wxPyEvent *src; +static void *SwigwxNotifyEventTowxCommandEvent(void *ptr) { + wxNotifyEvent *src; wxCommandEvent *dest; - src = (wxPyEvent *) ptr; + src = (wxNotifyEvent *) ptr; dest = (wxCommandEvent *) src; return (void *) dest; } +static void *SwigwxNotifyEventTowxEvent(void *ptr) { + wxNotifyEvent *src; + wxEvent *dest; + src = (wxNotifyEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + +#define wxNotifyEvent_IsAllowed(_swigobj) (_swigobj->IsAllowed()) +static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxNotifyEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_IsAllowed",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_IsAllowed. Expected _wxNotifyEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxNotifyEvent_IsAllowed(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxNotifyEvent_Veto(_swigobj) (_swigobj->Veto()) +static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxNotifyEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_Veto",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_Veto. Expected _wxNotifyEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxNotifyEvent_Veto(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxPyEventTowxEvent(void *ptr) { wxPyEvent *src; wxEvent *dest; @@ -3170,10 +3302,10 @@ static void *SwigwxPyEventTowxEvent(void *ptr) { static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyEvent * _result; - wxEventType _arg0 = (wxEventType ) wxEVT_NULL; + int _arg0 = (int ) 0; PyObject * _arg1 = (PyObject *) Py_None; PyObject * _obj1 = 0; - char *_kwnames[] = { "commandType","userData", NULL }; + char *_kwnames[] = { "id","userData", NULL }; char _ptemp[128]; self = self; @@ -3225,8 +3357,8 @@ static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args, PyObject return _resultobj; } -#define wxPyEvent_SetUserData(_swigobj,_swigarg0) (_swigobj->SetUserData(_swigarg0)) -static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyEvent_SetPyData(_swigobj,_swigarg0) (_swigobj->SetPyData(_swigarg0)) +static PyObject *_wrap_wxPyEvent_SetPyData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyEvent * _arg0; PyObject * _arg1; @@ -3235,12 +3367,12 @@ static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args, PyO char *_kwnames[] = { "self","userData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyEvent_SetUserData",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyEvent_SetPyData",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_SetUserData. Expected _wxPyEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_SetPyData. Expected _wxPyEvent_p."); return NULL; } } @@ -3249,7 +3381,7 @@ static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args, PyO } { wxPy_BEGIN_ALLOW_THREADS; - wxPyEvent_SetUserData(_arg0,_arg1); + wxPyEvent_SetPyData(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -3257,8 +3389,8 @@ static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxPyEvent_GetUserData(_swigobj) (_swigobj->GetUserData()) -static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyEvent_GetPyData(_swigobj) (_swigobj->GetPyData()) +static PyObject *_wrap_wxPyEvent_GetPyData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; PyObject * _result; wxPyEvent * _arg0; @@ -3266,18 +3398,18 @@ static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args, PyO char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyEvent_GetUserData",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyEvent_GetPyData",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_GetUserData. Expected _wxPyEvent_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyEvent_GetPyData. Expected _wxPyEvent_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (PyObject *)wxPyEvent_GetUserData(_arg0); + _result = (PyObject *)wxPyEvent_GetPyData(_arg0); wxPy_END_ALLOW_THREADS; }{ @@ -3286,69 +3418,107 @@ static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args, PyO return _resultobj; } -static void *SwigwxNotifyEventTowxCommandEvent(void *ptr) { - wxNotifyEvent *src; +static void *SwigwxPyCommandEventTowxCommandEvent(void *ptr) { + wxPyCommandEvent *src; wxCommandEvent *dest; - src = (wxNotifyEvent *) ptr; + src = (wxPyCommandEvent *) ptr; dest = (wxCommandEvent *) src; return (void *) dest; } -static void *SwigwxNotifyEventTowxEvent(void *ptr) { - wxNotifyEvent *src; +static void *SwigwxPyCommandEventTowxEvent(void *ptr) { + wxPyCommandEvent *src; wxEvent *dest; - src = (wxNotifyEvent *) ptr; + src = (wxPyCommandEvent *) ptr; dest = (wxEvent *) src; return (void *) dest; } -#define wxNotifyEvent_IsAllowed(_swigobj) (_swigobj->IsAllowed()) -static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPyCommandEvent(_swigarg0,_swigarg1,_swigarg2) (new wxPyCommandEvent(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_new_wxPyCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - bool _result; - wxNotifyEvent * _arg0; + wxPyCommandEvent * _result; + wxEventType _arg0 = (wxEventType ) wxEVT_NULL; + int _arg1 = (int ) 0; + PyObject * _arg2 = (PyObject *) Py_None; + PyObject * _obj2 = 0; + char *_kwnames[] = { "commandType","id","userData", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiO:new_wxPyCommandEvent",_kwnames,&_arg0,&_arg1,&_obj2)) + return NULL; + if (_obj2) +{ + _arg2 = _obj2; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxPyCommandEvent *)new_wxPyCommandEvent(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyCommandEvent_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxPyCommandEvent(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPyCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyCommandEvent * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_IsAllowed",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPyCommandEvent",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_IsAllowed. Expected _wxNotifyEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyCommandEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyCommandEvent. Expected _wxPyCommandEvent_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxNotifyEvent_IsAllowed(_arg0); + delete_wxPyCommandEvent(_arg0); wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxNotifyEvent_Veto(_swigobj) (_swigobj->Veto()) -static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyCommandEvent_SetPyData(_swigobj,_swigarg0) (_swigobj->SetPyData(_swigarg0)) +static PyObject *_wrap_wxPyCommandEvent_SetPyData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxNotifyEvent * _arg0; + wxPyCommandEvent * _arg0; + PyObject * _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","userData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_Veto",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyCommandEvent_SetPyData",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotifyEvent_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotifyEvent_Veto. Expected _wxNotifyEvent_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyCommandEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyCommandEvent_SetPyData. Expected _wxPyCommandEvent_p."); return NULL; } } +{ + _arg1 = _obj1; +} { wxPy_BEGIN_ALLOW_THREADS; - wxNotifyEvent_Veto(_arg0); + wxPyCommandEvent_SetPyData(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -3356,13 +3526,46 @@ static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxPyCommandEvent_GetPyData(_swigobj) (_swigobj->GetPyData()) +static PyObject *_wrap_wxPyCommandEvent_GetPyData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxPyCommandEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyCommandEvent_GetPyData",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyCommandEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyCommandEvent_GetPyData. Expected _wxPyCommandEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (PyObject *)wxPyCommandEvent_GetPyData(_arg0); + + wxPy_END_ALLOW_THREADS; +}{ + _resultobj = _result; +} + return _resultobj; +} + static PyMethodDef eventscMethods[] = { - { "wxNotifyEvent_Veto", (PyCFunction) _wrap_wxNotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS }, - { "wxNotifyEvent_IsAllowed", (PyCFunction) _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS }, - { "wxPyEvent_GetUserData", (PyCFunction) _wrap_wxPyEvent_GetUserData, METH_VARARGS | METH_KEYWORDS }, - { "wxPyEvent_SetUserData", (PyCFunction) _wrap_wxPyEvent_SetUserData, METH_VARARGS | METH_KEYWORDS }, + { "wxPyCommandEvent_GetPyData", (PyCFunction) _wrap_wxPyCommandEvent_GetPyData, METH_VARARGS | METH_KEYWORDS }, + { "wxPyCommandEvent_SetPyData", (PyCFunction) _wrap_wxPyCommandEvent_SetPyData, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxPyCommandEvent", (PyCFunction) _wrap_delete_wxPyCommandEvent, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyCommandEvent", (PyCFunction) _wrap_new_wxPyCommandEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxPyEvent_GetPyData", (PyCFunction) _wrap_wxPyEvent_GetPyData, METH_VARARGS | METH_KEYWORDS }, + { "wxPyEvent_SetPyData", (PyCFunction) _wrap_wxPyEvent_SetPyData, METH_VARARGS | METH_KEYWORDS }, { "delete_wxPyEvent", (PyCFunction) _wrap_delete_wxPyEvent, METH_VARARGS | METH_KEYWORDS }, { "new_wxPyEvent", (PyCFunction) _wrap_new_wxPyEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxNotifyEvent_Veto", (PyCFunction) _wrap_wxNotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS }, + { "wxNotifyEvent_IsAllowed", (PyCFunction) _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_SetText", (PyCFunction) _wrap_wxUpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_Enable", (PyCFunction) _wrap_wxUpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS }, { "wxUpdateUIEvent_Check", (PyCFunction) _wrap_wxUpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS }, @@ -3472,10 +3675,12 @@ static PyMethodDef eventscMethods[] = { */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxAcceleratorTable","_class_wxAcceleratorTable",0}, - { "_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, - { "_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, + { "_wxEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxEvent}, + { "_wxEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxEvent}, { "_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent}, { "_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent}, + { "_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, + { "_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, { "_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent}, { "_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent}, { "_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent}, @@ -3526,6 +3731,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -3563,10 +3769,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, - { "_class_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, - { "_class_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, + { "_class_wxEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxEvent}, + { "_class_wxEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxEvent}, { "_class_wxEvent","_class_wxPyEvent",SwigwxPyEventTowxEvent}, { "_class_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent}, + { "_class_wxEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, + { "_class_wxEvent","_wxNotifyEvent",SwigwxNotifyEventTowxEvent}, { "_class_wxEvent","_class_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent}, { "_class_wxEvent","_wxSysColourChangedEvent",SwigwxSysColourChangedEventTowxEvent}, { "_class_wxEvent","_class_wxUpdateUIEvent",SwigwxUpdateUIEventTowxEvent}, @@ -3615,10 +3823,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent}, { "_class_wxEvent","_wxEvent",0}, { "_wxRect","_class_wxRect",0}, + { "_wxCommandEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, + { "_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, - { "_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent}, - { "_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent}, @@ -3698,6 +3906,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, @@ -3711,10 +3920,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRegion","_class_wxRegion",0}, { "_class_wxShowEvent","_wxShowEvent",0}, { "_wxActivateEvent","_class_wxActivateEvent",0}, + { "_class_wxCommandEvent","_class_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, + { "_class_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, - { "_class_wxCommandEvent","_class_wxPyEvent",SwigwxPyEventTowxCommandEvent}, - { "_class_wxCommandEvent","_wxPyEvent",SwigwxPyEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent}, diff --git a/utils/wxPython/src/gtk/events.py b/utils/wxPython/src/gtk/events.py index a6411a874b..340f4178ac 100644 --- a/utils/wxPython/src/gtk/events.py +++ b/utils/wxPython/src/gtk/events.py @@ -618,18 +618,37 @@ class wxSysColourChangedEvent(wxSysColourChangedEventPtr): -class wxPyEventPtr(wxCommandEventPtr): +class wxNotifyEventPtr(wxCommandEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def IsAllowed(self, *_args, **_kwargs): + val = apply(eventsc.wxNotifyEvent_IsAllowed,(self,) + _args, _kwargs) + return val + def Veto(self, *_args, **_kwargs): + val = apply(eventsc.wxNotifyEvent_Veto,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxNotifyEvent(wxNotifyEventPtr): + def __init__(self,this): + self.this = this + + + + +class wxPyEventPtr(wxEventPtr): def __init__(self,this): self.this = this self.thisown = 0 def __del__(self,eventsc=eventsc): if self.thisown == 1 : eventsc.delete_wxPyEvent(self) - def SetUserData(self, *_args, **_kwargs): - val = apply(eventsc.wxPyEvent_SetUserData,(self,) + _args, _kwargs) + def SetPyData(self, *_args, **_kwargs): + val = apply(eventsc.wxPyEvent_SetPyData,(self,) + _args, _kwargs) return val - def GetUserData(self, *_args, **_kwargs): - val = apply(eventsc.wxPyEvent_GetUserData,(self,) + _args, _kwargs) + def GetPyData(self, *_args, **_kwargs): + val = apply(eventsc.wxPyEvent_GetPyData,(self,) + _args, _kwargs) return val def __repr__(self): return "" % (self.this,) @@ -641,21 +660,25 @@ class wxPyEvent(wxPyEventPtr): -class wxNotifyEventPtr(wxCommandEventPtr): +class wxPyCommandEventPtr(wxCommandEventPtr): def __init__(self,this): self.this = this self.thisown = 0 - def IsAllowed(self, *_args, **_kwargs): - val = apply(eventsc.wxNotifyEvent_IsAllowed,(self,) + _args, _kwargs) + def __del__(self,eventsc=eventsc): + if self.thisown == 1 : + eventsc.delete_wxPyCommandEvent(self) + def SetPyData(self, *_args, **_kwargs): + val = apply(eventsc.wxPyCommandEvent_SetPyData,(self,) + _args, _kwargs) return val - def Veto(self, *_args, **_kwargs): - val = apply(eventsc.wxNotifyEvent_Veto,(self,) + _args, _kwargs) + def GetPyData(self, *_args, **_kwargs): + val = apply(eventsc.wxPyCommandEvent_GetPyData,(self,) + _args, _kwargs) return val def __repr__(self): - return "" % (self.this,) -class wxNotifyEvent(wxNotifyEventPtr): - def __init__(self,this): - self.this = this + return "" % (self.this,) +class wxPyCommandEvent(wxPyCommandEventPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(eventsc.new_wxPyCommandEvent,_args,_kwargs) + self.thisown = 1 diff --git a/utils/wxPython/src/gtk/frames.cpp b/utils/wxPython/src/gtk/frames.cpp index 00008df982..934dbfb4cb 100644 --- a/utils/wxPython/src/gtk/frames.cpp +++ b/utils/wxPython/src/gtk/frames.cpp @@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -147,13 +136,15 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa char * _arg6 = (char *) "frame"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -169,20 +160,18 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwa } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxFrame. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxFrame. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxFrame *)new_wxFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -872,13 +861,15 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject char * _arg6 = (char *) "frame"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMiniFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMiniFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -894,20 +885,18 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMiniFrame. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMiniFrame. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxMiniFrame *)new_wxMiniFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -962,6 +951,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -1029,6 +1019,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -1045,6 +1036,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxToolBarTool","_class_wxToolBarTool",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}, @@ -1097,6 +1089,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -1158,6 +1151,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -1167,6 +1161,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, diff --git a/utils/wxPython/src/gtk/gdi.cpp b/utils/wxPython/src/gtk/gdi.cpp index 7fd343933f..6fb916e991 100644 --- a/utils/wxPython/src/gtk/gdi.cpp +++ b/utils/wxPython/src/gtk/gdi.cpp @@ -107,17 +107,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; // Alternate 'constructor' wxBitmap* wxEmptyBitmap(int width, int height, int depth=-1) { @@ -5661,11 +5650,12 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject wxScreenDC * _arg0; wxRect * _arg1 = (wxRect *) NULL; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxScreenDC_StartDrawingOnTopRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxScreenDC_StartDrawingOnTopRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -5674,13 +5664,12 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTopRect. Expected _wxRect_p."); + if (_obj1) +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxScreenDC_StartDrawingOnTopRect(_arg0,_arg1); diff --git a/utils/wxPython/src/gtk/image.cpp b/utils/wxPython/src/gtk/image.cpp index c2ed6140ee..70ae9f99af 100644 --- a/utils/wxPython/src/gtk/image.cpp +++ b/utils/wxPython/src/gtk/image.cpp @@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; wxImage* wxNullImage() { diff --git a/utils/wxPython/src/gtk/mdi.cpp b/utils/wxPython/src/gtk/mdi.cpp index 2a10eff768..bd9df23c41 100644 --- a/utils/wxPython/src/gtk/mdi.cpp +++ b/utils/wxPython/src/gtk/mdi.cpp @@ -102,17 +102,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -154,13 +143,15 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb char * _arg6 = (char *) "frame"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIParentFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIParentFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -176,20 +167,18 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIParentFrame. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIParentFrame. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxMDIParentFrame *)new_wxMDIParentFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -483,13 +472,15 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj char * _arg6 = (char *) "frame"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIChildFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIChildFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -505,20 +496,18 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxMDIChildFrame. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxMDIChildFrame. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxMDIChildFrame *)new_wxMDIChildFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -702,6 +691,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -771,6 +761,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -787,6 +778,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxToolBarTool","_class_wxToolBarTool",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}, @@ -845,6 +837,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -908,6 +901,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -918,6 +912,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, diff --git a/utils/wxPython/src/gtk/misc.cpp b/utils/wxPython/src/gtk/misc.cpp index 8dbcb7b144..371adf304f 100644 --- a/utils/wxPython/src/gtk/misc.cpp +++ b/utils/wxPython/src/gtk/misc.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; char* wxGetResource(char *section, char *entry, char *file = NULL) { @@ -490,11 +479,12 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args, PyObj PyObject * _obj1 = 0; PyObject * _obj2 = 0; PyObject * _argo6 = 0; - PyObject * _argo7 = 0; + wxPoint temp; + PyObject * _obj7 = 0; char *_kwnames[] = { "message","prompt","caption","value","min","max","parent","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOl|llOO:wxGetNumberFromUser",_kwnames,&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_argo7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOl|llOO:wxGetNumberFromUser",_kwnames,&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_obj7)) return NULL; { if (!PyString_Check(_obj0)) { @@ -524,13 +514,12 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args, PyObj return NULL; } } - if (_argo7) { - if (_argo7 == Py_None) { _arg7 = NULL; } - else if (SWIG_GetPtrObj(_argo7,(void **) &_arg7,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of wxGetNumberFromUser. Expected _wxPoint_p."); + if (_obj7) +{ + _arg7 = &temp; + if (! wxPoint_helper(_obj7, &_arg7)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxGetNumberFromUser(*_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6,*_arg7); @@ -1244,19 +1233,18 @@ static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args, PyObject *kw long _result; wxSize * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_x_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_x_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_x_set(_arg0,_arg1); @@ -1271,19 +1259,18 @@ static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args, PyObject *kw PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_x_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_x_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_x_get(_arg0); @@ -1299,19 +1286,18 @@ static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args, PyObject *kw long _result; wxSize * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_y_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_y_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_y_set(_arg0,_arg1); @@ -1326,19 +1312,18 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args, PyObject *kw PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_y_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_y_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_y_get(_arg0); @@ -1379,19 +1364,18 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxSize",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxSize. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; delete_wxSize(_arg0); @@ -1408,19 +1392,18 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args, PyObject *kwar wxSize * _arg0; long _arg1; long _arg2; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","w","h", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxSize_Set",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxSize_Set",_kwnames,&_obj0,&_arg1,&_arg2)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_Set. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxSize_Set(_arg0,_arg1,_arg2); @@ -1436,19 +1419,18 @@ static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetX",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetX",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_GetX(_arg0); @@ -1463,19 +1445,18 @@ static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetY",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetY",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_GetY(_arg0); @@ -1490,19 +1471,18 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetWidth",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetWidth",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_GetWidth(_arg0); @@ -1517,19 +1497,18 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetHeight",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetHeight",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxSize_GetHeight(_arg0); @@ -1544,19 +1523,18 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; wxSize * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","w", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetWidth",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetWidth",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetWidth. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxSize_SetWidth(_arg0,_arg1); @@ -1572,19 +1550,18 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; wxSize * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","h", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetHeight",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetHeight",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_SetHeight. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxSize_SetHeight(_arg0,_arg1); @@ -1605,19 +1582,18 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args, PyObject * PyObject * _resultobj; PyObject * _result; wxSize * _arg0; - PyObject * _argo0 = 0; + wxSize temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_asTuple",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_asTuple",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p."); +{ + _arg0 = &temp; + if (! wxSize_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (PyObject *)wxSize_asTuple(_arg0); @@ -1635,19 +1611,18 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args, PyObjec double _result; wxRealPoint * _arg0; double _arg1; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_x_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_x_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_set. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (double )wxRealPoint_x_set(_arg0,_arg1); @@ -1662,19 +1637,18 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args, PyObjec PyObject * _resultobj; double _result; wxRealPoint * _arg0; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_x_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_x_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_x_get. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (double )wxRealPoint_x_get(_arg0); @@ -1690,19 +1664,18 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args, PyObjec double _result; wxRealPoint * _arg0; double _arg1; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_y_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_y_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_set. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (double )wxRealPoint_y_set(_arg0,_arg1); @@ -1717,19 +1690,18 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args, PyObjec PyObject * _resultobj; double _result; wxRealPoint * _arg0; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_y_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_y_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_y_get. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (double )wxRealPoint_y_get(_arg0); @@ -1770,19 +1742,18 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args, PyObject static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxRealPoint * _arg0; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRealPoint",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRealPoint",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRealPoint. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; delete_wxRealPoint(_arg0); @@ -1802,19 +1773,18 @@ static PyObject *_wrap_wxRealPoint_Set(PyObject *self, PyObject *args, PyObject wxRealPoint * _arg0; double _arg1; double _arg2; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxRealPoint_Set",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxRealPoint_Set",_kwnames,&_obj0,&_arg1,&_arg2)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_Set. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxRealPoint_Set(_arg0,_arg1,_arg2); @@ -1835,19 +1805,18 @@ static PyObject *_wrap_wxRealPoint_asTuple(PyObject *self, PyObject *args, PyObj PyObject * _resultobj; PyObject * _result; wxRealPoint * _arg0; - PyObject * _argo0 = 0; + wxRealPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_asTuple",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_asTuple",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_asTuple. Expected _wxRealPoint_p."); +{ + _arg0 = &temp; + if (! wxRealPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (PyObject *)wxRealPoint_asTuple(_arg0); @@ -1865,19 +1834,18 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args, PyObject *k long _result; wxPoint * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_x_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_x_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_set. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxPoint_x_set(_arg0,_arg1); @@ -1892,19 +1860,18 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args, PyObject *k PyObject * _resultobj; long _result; wxPoint * _arg0; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_x_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_x_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_x_get. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxPoint_x_get(_arg0); @@ -1920,19 +1887,18 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args, PyObject *k long _result; wxPoint * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_y_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_y_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_set. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxPoint_y_set(_arg0,_arg1); @@ -1947,19 +1913,18 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args, PyObject *k PyObject * _resultobj; long _result; wxPoint * _arg0; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_y_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_y_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_y_get. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxPoint_y_get(_arg0); @@ -2000,19 +1965,18 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args, PyObject *kwa static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPoint * _arg0; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPoint",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPoint",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPoint. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; delete_wxPoint(_arg0); @@ -2032,19 +1996,18 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args, PyObject *kwa wxPoint * _arg0; long _arg1; long _arg2; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxPoint_Set",_kwnames,&_argo0,&_arg1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxPoint_Set",_kwnames,&_obj0,&_arg1,&_arg2)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_Set. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPoint_Set(_arg0,_arg1,_arg2); @@ -2065,19 +2028,18 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; PyObject * _result; wxPoint * _arg0; - PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_asTuple",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_asTuple",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p."); +{ + _arg0 = &temp; + if (! wxPoint_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (PyObject *)wxPoint_asTuple(_arg0); @@ -2122,19 +2084,18 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwar static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRect",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRect",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRect. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; delete_wxRect(_arg0); @@ -2150,19 +2111,18 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetX",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetX",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetX. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetX(_arg0); @@ -2177,19 +2137,18 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","X", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetX",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetX",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetX. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxRect_SetX(_arg0,_arg1); @@ -2205,19 +2164,18 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetY",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetY",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetY. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetY(_arg0); @@ -2232,19 +2190,18 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwa PyObject * _resultobj; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","Y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetY",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetY",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetY. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxRect_SetY(_arg0,_arg1); @@ -2260,19 +2217,18 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetWidth",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetWidth",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetWidth. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetWidth(_arg0); @@ -2287,19 +2243,18 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","w", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetWidth",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetWidth",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetWidth. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxRect_SetWidth(_arg0,_arg1); @@ -2315,19 +2270,18 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetHeight",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetHeight",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetHeight. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetHeight(_arg0); @@ -2342,19 +2296,18 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","h", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetHeight",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetHeight",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_SetHeight. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxRect_SetHeight(_arg0,_arg1); @@ -2370,20 +2323,19 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args, PyObje PyObject * _resultobj; wxPoint * _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetPosition",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetPosition",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetPosition. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxPoint (wxRect_GetPosition(_arg0)); @@ -2399,20 +2351,19 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args, PyObject * PyObject * _resultobj; wxSize * _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetSize",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetSize",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetSize. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxSize (wxRect_GetSize(_arg0)); @@ -2428,19 +2379,18 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject * PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetLeft",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetLeft",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetLeft. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetLeft(_arg0); @@ -2455,19 +2405,18 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *k PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetTop",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetTop",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetTop. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetTop(_arg0); @@ -2482,19 +2431,18 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetBottom",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetBottom",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetBottom. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetBottom(_arg0); @@ -2509,19 +2457,18 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetRight",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetRight",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_GetRight. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_GetRight(_arg0); @@ -2537,19 +2484,18 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kw long _result; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","x", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_x_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_x_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_set. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_x_set(_arg0,_arg1); @@ -2564,19 +2510,18 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kw PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_x_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_x_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_x_get. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_x_get(_arg0); @@ -2592,19 +2537,18 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kw long _result; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","y", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_y_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_y_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_set. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_y_set(_arg0,_arg1); @@ -2619,19 +2563,18 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kw PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_y_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_y_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_y_get. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_y_get(_arg0); @@ -2647,19 +2590,18 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject long _result; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","width", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_width_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_width_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_set. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_width_set(_arg0,_arg1); @@ -2674,19 +2616,18 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_width_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_width_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_width_get. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_width_get(_arg0); @@ -2702,19 +2643,18 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObjec long _result; wxRect * _arg0; long _arg1; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self","height", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_height_set",_kwnames,&_argo0,&_arg1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_height_set",_kwnames,&_obj0,&_arg1)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_set. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_height_set(_arg0,_arg1); @@ -2729,19 +2669,18 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObjec PyObject * _resultobj; long _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_height_get",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_height_get",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_height_get. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (long )wxRect_height_get(_arg0); @@ -2763,19 +2702,18 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args, PyObject * PyObject * _resultobj; PyObject * _result; wxRect * _arg0; - PyObject * _argo0 = 0; + wxRect temp; + PyObject * _obj0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_asTuple",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_asTuple",_kwnames,&_obj0)) return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p."); +{ + _arg0 = &temp; + if (! wxRect_helper(_obj0, &_arg0)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (PyObject *)wxRect_asTuple(_arg0); @@ -3685,11 +3623,12 @@ static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args, Py wxRegion * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsPoint",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsPoint",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3698,13 +3637,11 @@ static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args, Py return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxRegionContain )wxRegion_ContainsPoint(_arg0,*_arg1); @@ -3721,11 +3658,12 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args, PyO wxRegion * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3734,13 +3672,11 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args, PyO return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxRegionContain )wxRegion_ContainsRect(_arg0,*_arg1); @@ -3786,11 +3722,12 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje wxRegion * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Intersect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Intersect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3799,13 +3736,11 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxRegion_Intersect(_arg0,*_arg1); @@ -3822,11 +3757,12 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec wxRegion * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Subtract",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Subtract",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3835,13 +3771,11 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObjec return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxRegion_Subtract(_arg0,*_arg1); @@ -3858,11 +3792,12 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject * wxRegion * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Union",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Union",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3871,13 +3806,11 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxRegion_Union(_arg0,*_arg1); @@ -3894,11 +3827,12 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw wxRegion * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Xor",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Xor",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3907,13 +3841,11 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kw return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxRegion_Xor(_arg0,*_arg1); @@ -4286,6 +4218,33 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args, Py return _resultobj; } +#define delete_wxAcceleratorEntry(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxAcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxAcceleratorEntry * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxAcceleratorEntry",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorEntry_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxAcceleratorEntry. Expected _wxAcceleratorEntry_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + delete_wxAcceleratorEntry(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxAcceleratorEntry_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -4443,12 +4402,41 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args, Py return _resultobj; } +#define delete_wxAcceleratorTable(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxAcceleratorTable * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxAcceleratorTable",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxAcceleratorTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxAcceleratorTable. Expected _wxAcceleratorTable_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + delete_wxAcceleratorTable(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyMethodDef misccMethods[] = { + { "delete_wxAcceleratorTable", (PyCFunction) _wrap_delete_wxAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "new_wxAcceleratorTable", (PyCFunction) _wrap_new_wxAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "wxAcceleratorEntry_GetCommand", (PyCFunction) _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS }, { "wxAcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, { "wxAcceleratorEntry_GetFlags", (PyCFunction) _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS }, { "wxAcceleratorEntry_Set", (PyCFunction) _wrap_wxAcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxAcceleratorEntry", (PyCFunction) _wrap_delete_wxAcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, { "new_wxAcceleratorEntry", (PyCFunction) _wrap_new_wxAcceleratorEntry, METH_VARARGS | METH_KEYWORDS }, { "wxRegionIterator_Next", (PyCFunction) _wrap_wxRegionIterator_Next, METH_VARARGS | METH_KEYWORDS }, { "wxRegionIterator_Reset", (PyCFunction) _wrap_wxRegionIterator_Reset, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/gtk/misc.py b/utils/wxPython/src/gtk/misc.py index 17776dd3af..6e3e770d81 100644 --- a/utils/wxPython/src/gtk/misc.py +++ b/utils/wxPython/src/gtk/misc.py @@ -459,6 +459,9 @@ class wxAcceleratorEntryPtr : def __init__(self,this): self.this = this self.thisown = 0 + def __del__(self,miscc=miscc): + if self.thisown == 1 : + miscc.delete_wxAcceleratorEntry(self) def Set(self, *_args, **_kwargs): val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs) return val @@ -485,6 +488,9 @@ class wxAcceleratorTablePtr : def __init__(self,this): self.this = this self.thisown = 0 + def __del__(self,miscc=miscc): + if self.thisown == 1 : + miscc.delete_wxAcceleratorTable(self) def __repr__(self): return "" % (self.this,) class wxAcceleratorTable(wxAcceleratorTablePtr): diff --git a/utils/wxPython/src/gtk/misc2.cpp b/utils/wxPython/src/gtk/misc2.cpp index d4d6010b8c..a22d6ade9b 100644 --- a/utils/wxPython/src/gtk/misc2.cpp +++ b/utils/wxPython/src/gtk/misc2.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; void wxToolTip_Enable(bool flag) { @@ -462,12 +451,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_wxRect","_class_wxRect",0}, { "_wxPoint","_class_wxPoint",0}, { "_wxBitmap","_class_wxBitmap",0}, { "_wxPyTimer","_class_wxPyTimer",0}, { "_wxWindowDC","_class_wxWindowDC",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, + { "_class_wxValidator","_wxValidator",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, @@ -496,6 +487,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_short",0}, { "_class_wxWindow","_wxWindow",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_wxClientDC","_class_wxClientDC",0}, { "_class_wxPoint","_wxPoint",0}, { "_wxRealPoint","_class_wxRealPoint",0}, @@ -539,6 +531,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, { "_class_wxPaintDC","_wxPaintDC",0}, + { "_wxValidator","_class_wxValidator",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_class_wxIcon","_wxIcon",0}, { "_class_wxColour","_wxColour",0}, diff --git a/utils/wxPython/src/gtk/printfw.cpp b/utils/wxPython/src/gtk/printfw.cpp index 7e4f5c344a..2fc5736b1d 100644 --- a/utils/wxPython/src/gtk/printfw.cpp +++ b/utils/wxPython/src/gtk/printfw.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; class wxPyPrintout : public wxPrintout { @@ -714,11 +703,12 @@ static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args, wxPrintData * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","sz", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPaperSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPaperSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -727,13 +717,11 @@ static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPrintData_SetPaperSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPrintData_SetPaperSize(_arg0,*_arg1); @@ -1437,11 +1425,12 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, Py wxPageSetupDialogData * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginTopLeft",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginTopLeft",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1450,13 +1439,11 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, Py return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginTopLeft. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPageSetupDialogData_SetMarginTopLeft(_arg0,*_arg1); @@ -1473,11 +1460,12 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self wxPageSetupDialogData * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginBottomRight",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginBottomRight",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1486,13 +1474,11 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMarginBottomRight. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPageSetupDialogData_SetMarginBottomRight(_arg0,*_arg1); @@ -1509,11 +1495,12 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self, wxPageSetupDialogData * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginTopLeft",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginTopLeft",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1522,13 +1509,11 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginTopLeft. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPageSetupDialogData_SetMinMarginTopLeft(_arg0,*_arg1); @@ -1545,11 +1530,12 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *s wxPageSetupDialogData * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginBottomRight",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginBottomRight",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1558,13 +1544,11 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *s return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetMinMarginBottomRight. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPageSetupDialogData_SetMinMarginBottomRight(_arg0,*_arg1); @@ -1617,11 +1601,12 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObje wxPageSetupDialogData * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetPaperSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetPaperSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1630,13 +1615,11 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPageSetupDialogData_SetPaperSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPageSetupDialogData_SetPaperSize(_arg0,*_arg1); @@ -4149,13 +4132,15 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje PyObject * _argo0 = 0; PyObject * _argo1 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "preview","parent","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOls:new_wxPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOls:new_wxPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4178,20 +4163,18 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObje } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPreviewFrame. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxPreviewFrame. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxPreviewFrame *)new_wxPreviewFrame(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -4377,6 +4360,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -4466,6 +4450,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -4487,6 +4472,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_wxMessageDialog","_class_wxMessageDialog",0}, + { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, @@ -4552,6 +4538,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxStaticText","_wxStaticText",0}, { "_wxPrintDialogData","_class_wxPrintDialogData",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -4620,6 +4607,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxPrintPreview","_wxPrintPreview",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, @@ -4630,6 +4618,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, diff --git a/utils/wxPython/src/gtk/sizers.cpp b/utils/wxPython/src/gtk/sizers.cpp new file mode 100644 index 0000000000..3bb5e0f308 --- /dev/null +++ b/utils/wxPython/src/gtk/sizers.cpp @@ -0,0 +1,1692 @@ +/* + * FILE : gtk/sizers.cpp + * + * This file was automatically generated by : + * Simplified Wrapper and Interface Generator (SWIG) + * Version 1.1 (Build 810) + * + * Portions Copyright (c) 1995-1998 + * The University of Utah and The Regents of the University of California. + * Permission is granted to distribute this file in any manner provided + * this notice remains intact. + * + * Do not make changes to this file--changes will be lost! + * + */ + + +#define SWIGCODE +/* Implementation : PYTHON */ + +#define SWIGPYTHON +#include +#include +/* Definitions for Windows/Unix exporting */ +#if defined(__WIN32__) +# if defined(_MSC_VER) +# define SWIGEXPORT(a) __declspec(dllexport) a +# else +# if defined(__BORLANDC__) +# define SWIGEXPORT(a) a _export +# else +# define SWIGEXPORT(a) a +# endif +# endif +#else +# define SWIGEXPORT(a) a +#endif + +#ifdef __cplusplus +extern "C" { +#endif +#include "Python.h" +extern void SWIG_MakePtr(char *, void *, char *); +extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *)); +extern char *SWIG_GetPtr(char *, void **, char *); +extern char *SWIG_GetPtrObj(PyObject *, void **, char *); +extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *)); +extern PyObject *SWIG_newvarlink(void); +#ifdef __cplusplus +} +#endif +#define SWIG_init initsizersc + +#define SWIG_name "sizersc" + +#include "helpers.h" + +static PyObject* l_output_helper(PyObject* target, PyObject* o) { + PyObject* o2; + PyObject* o3; + 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; + PyObject* o3; + + if (!target) { + target = o; + } else if (target == Py_None) { + Py_DECREF(Py_None); + target = o; + } else { + if (!PyTuple_Check(target)) { + o2 = target; + target = PyTuple_New(1); + PyTuple_SetItem(target, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); + + o2 = target; + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return target; +} + +static char* wxStringErrorMsg = "string type is required for parameter"; + +class wxPyUserData : public wxObject { +public: + wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); } + ~wxPyUserData() { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_obj); + wxPySaveThread(doSave); + } + PyObject* m_obj; +}; + +class wxPySizer : public wxSizer { + DECLARE_DYNAMIC_CLASS(wxPySizer); +public: + wxPySizer() : wxSizer() {}; + + DEC_PYCALLBACK___pure(RecalcSizes); + DEC_PYCALLBACK_wxSize__pure(CalcMin); + PYPRIVATE; +}; + + +IMP_PYCALLBACK___pure(wxPySizer, wxSizer, RecalcSizes); +IMP_PYCALLBACK_wxSize__pure(wxPySizer, wxSizer, CalcMin); + +IMPLEMENT_DYNAMIC_CLASS(wxPySizer, wxSizer); +#ifdef __cplusplus +extern "C" { +#endif +#define wxSizerItem_GetSize(_swigobj) (_swigobj->GetSize()) +static PyObject *_wrap_wxSizerItem_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetSize",_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_GetSize. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxSizerItem_GetSize(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizerItem_CalcMin(_swigobj) (_swigobj->CalcMin()) +static PyObject *_wrap_wxSizerItem_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_CalcMin",_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_CalcMin. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxSizerItem_CalcMin(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizerItem_SetDimension(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetDimension(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxSizerItem_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizerItem * _arg0; + wxPoint * _arg1; + wxSize * _arg2; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + wxSize temp0; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","pos","size", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxSizerItem_SetDimension",_kwnames,&_argo0,&_obj1,&_obj2)) + 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_SetDimension. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + _arg2 = &temp0; + if (! wxSize_helper(_obj2, &_arg2)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizerItem_SetDimension(_arg0,*_arg1,*_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizerItem_IsWindow(_swigobj) (_swigobj->IsWindow()) +static PyObject *_wrap_wxSizerItem_IsWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_IsWindow",_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_IsWindow. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizerItem_IsWindow(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizerItem_IsSizer(_swigobj) (_swigobj->IsSizer()) +static PyObject *_wrap_wxSizerItem_IsSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_IsSizer",_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_IsSizer. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizerItem_IsSizer(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizerItem_IsSpacer(_swigobj) (_swigobj->IsSpacer()) +static PyObject *_wrap_wxSizerItem_IsSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_IsSpacer",_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_IsSpacer. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizerItem_IsSpacer(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizerItem_GetWindow(_swigobj) (_swigobj->GetWindow()) +static PyObject *_wrap_wxSizerItem_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetWindow",_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_GetWindow. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _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; + } + return _resultobj; +} + +#define wxSizerItem_GetSizer(_swigobj) (_swigobj->GetSizer()) +static PyObject *_wrap_wxSizerItem_GetSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetSizer",_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_GetSizer. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _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; + } + return _resultobj; +} + +#define wxSizerItem_GetOption(_swigobj) (_swigobj->GetOption()) +static PyObject *_wrap_wxSizerItem_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetOption",_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_GetOption. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxSizerItem_GetOption(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizerItem_GetFlag(_swigobj) (_swigobj->GetFlag()) +static PyObject *_wrap_wxSizerItem_GetFlag(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetFlag",_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_GetFlag. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxSizerItem_GetFlag(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizerItem_GetBorder(_swigobj) (_swigobj->GetBorder()) +static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetBorder",_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_GetBorder. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxSizerItem_GetBorder(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject * wxSizerItem_GetUserData(wxSizerItem *self) { + wxPyUserData* data = (wxPyUserData*)self->GetUserData(); + if (data) { + Py_INCREF(data->m_obj); + return data->m_obj; + } else { + Py_INCREF(Py_None); + return Py_None; + } + } +static PyObject *_wrap_wxSizerItem_GetUserData(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxSizerItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizerItem_GetUserData",_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_GetUserData. Expected _wxSizerItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (PyObject *)wxSizerItem_GetUserData(_arg0); + + wxPy_END_ALLOW_THREADS; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static void wxSizer_Destroy(wxSizer *self) { delete self; } +static PyObject *_wrap_wxSizer_Destroy(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_Destroy",_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_Destroy. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_Destroy(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_AddWindow(wxSizer *self,wxWindow * window,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Add(window, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_AddWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxWindow * _arg1; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _arg5 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","window","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_AddWindow",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + 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_AddWindow. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_AddWindow. Expected _wxWindow_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = _obj5; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_AddWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_AddSizer(wxSizer *self,wxSizer * sizer,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Add(sizer, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_AddSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxSizer * _arg1; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _arg5 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","sizer","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_AddSizer",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + 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_AddSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_AddSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = _obj5; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_AddSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_AddSpacer(wxSizer *self,int width,int height,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Add(width, height, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_AddSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + int _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _arg6 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","width","height","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiiO:wxSizer_AddSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) + 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_AddSpacer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj6) +{ + _arg6 = _obj6; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_AddSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_PrependWindow(wxSizer *self,wxWindow * window,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Prepend(window, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_PrependWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxWindow * _arg1; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _arg5 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","window","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_PrependWindow",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + 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_PrependWindow. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_PrependWindow. Expected _wxWindow_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = _obj5; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_PrependWindow(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_PrependSizer(wxSizer *self,wxSizer * sizer,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Prepend(sizer, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_PrependSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxSizer * _arg1; + int _arg2 = (int ) 0; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _arg5 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","sizer","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiiO:wxSizer_PrependSizer",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_obj5)) + 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_PrependSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_PrependSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = _obj5; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_PrependSizer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxSizer_PrependSpacer(wxSizer *self,int width,int height,int option,int flag,int border,PyObject * userData) { + wxPyUserData* data = NULL; + if (userData) data = new wxPyUserData(userData); + self->Prepend(width, height, option, flag, border, data); + } +static PyObject *_wrap_wxSizer_PrependSpacer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + int _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _arg6 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj6 = 0; + char *_kwnames[] = { "self","width","height","option","flag","border","userData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|iiiO:wxSizer_PrependSpacer",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_obj6)) + 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_PrependSpacer. Expected _wxSizer_p."); + return NULL; + } + } + if (_obj6) +{ + _arg6 = _obj6; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_PrependSpacer(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_RemoveWindow(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) +static PyObject *_wrap_wxSizer_RemoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizer * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_RemoveWindow",_kwnames,&_argo0,&_argo1)) + 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_RemoveWindow. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_RemoveWindow. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizer_RemoveWindow(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizer_RemoveSizer(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) +static PyObject *_wrap_wxSizer_RemoveSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizer * _arg0; + wxSizer * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","sizer", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_RemoveSizer",_kwnames,&_argo0,&_argo1)) + 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_RemoveSizer. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_RemoveSizer. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizer_RemoveSizer(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizer_RemovePos(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) +static PyObject *_wrap_wxSizer_RemovePos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxSizer * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizer_RemovePos",_kwnames,&_argo0,&_arg1)) + 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_RemovePos. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxSizer_RemovePos(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSizer_SetDimension(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetDimension(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxSizer_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + int _arg1; + int _arg2; + int _arg3; + int _arg4; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","width","height", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii:wxSizer_SetDimension",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + 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_SetDimension. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetDimension(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_GetSize(_swigobj) (_swigobj->GetSize()) +static PyObject *_wrap_wxSizer_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetSize",_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_GetSize. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxSizer_GetSize(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizer_GetPosition(_swigobj) (_swigobj->GetPosition()) +static PyObject *_wrap_wxSizer_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetPosition",_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_GetPosition. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxPoint (wxSizer_GetPosition(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizer_GetMinSize(_swigobj) (_swigobj->GetMinSize()) +static PyObject *_wrap_wxSizer_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetMinSize",_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_GetMinSize. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxSizer_GetMinSize(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSizer_Layout(_swigobj) (_swigobj->Layout()) +static PyObject *_wrap_wxSizer_Layout(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_Layout",_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_Layout. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_Layout(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_Fit(_swigobj,_swigarg0) (_swigobj->Fit(_swigarg0)) +static PyObject *_wrap_wxSizer_Fit(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_Fit",_kwnames,&_argo0,&_argo1)) + 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_Fit. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_Fit. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_Fit(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSizer_SetSizeHints(_swigobj,_swigarg0) (_swigobj->SetSizeHints(_swigarg0)) +static PyObject *_wrap_wxSizer_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer_SetSizeHints",_kwnames,&_argo0,&_argo1)) + 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_SetSizeHints. Expected _wxSizer_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSizer_SetSizeHints. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxSizer_SetSizeHints(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject * wxSizer_GetChildren(wxSizer *self) { + wxList& list = self->GetChildren(); + return wxPy_ConvertList(&list, "wxSizerItem"); + } +static PyObject *_wrap_wxSizer_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + PyObject * _result; + wxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizer_GetChildren",_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_GetChildren. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (PyObject *)wxSizer_GetChildren(_arg0); + + wxPy_END_ALLOW_THREADS; +}{ + _resultobj = _result; +} + return _resultobj; +} + +static void *SwigwxPySizerTowxSizer(void *ptr) { + wxPySizer *src; + wxSizer *dest; + src = (wxPySizer *) ptr; + dest = (wxSizer *) src; + return (void *) dest; +} + +#define new_wxPySizer() (new wxPySizer()) +static PyObject *_wrap_new_wxPySizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPySizer * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPySizer",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxPySizer *)new_wxPySizer(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPySizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPySizer__setSelf(_swigobj,_swigarg0) (_swigobj->_setSelf(_swigarg0)) +static PyObject *_wrap_wxPySizer__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPySizer * _arg0; + PyObject * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPySizer__setSelf",_kwnames,&_argo0,&_obj1)) + 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."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPySizer__setSelf(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void *SwigwxBoxSizerTowxSizer(void *ptr) { + wxBoxSizer *src; + wxSizer *dest; + src = (wxBoxSizer *) ptr; + dest = (wxSizer *) src; + return (void *) dest; +} + +#define new_wxBoxSizer(_swigarg0) (new wxBoxSizer(_swigarg0)) +static PyObject *_wrap_new_wxBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBoxSizer * _result; + int _arg0 = (int ) wxHORIZONTAL; + char *_kwnames[] = { "orient", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:new_wxBoxSizer",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxBoxSizer *)new_wxBoxSizer(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBoxSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxBoxSizer_GetOrientation(_swigobj) (_swigobj->GetOrientation()) +static PyObject *_wrap_wxBoxSizer_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxBoxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBoxSizer_GetOrientation",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxBoxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBoxSizer_GetOrientation. Expected _wxBoxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxBoxSizer_GetOrientation(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxStaticBoxSizerTowxBoxSizer(void *ptr) { + wxStaticBoxSizer *src; + wxBoxSizer *dest; + src = (wxStaticBoxSizer *) ptr; + dest = (wxBoxSizer *) src; + return (void *) dest; +} + +static void *SwigwxStaticBoxSizerTowxSizer(void *ptr) { + wxStaticBoxSizer *src; + wxSizer *dest; + src = (wxStaticBoxSizer *) ptr; + dest = (wxSizer *) 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; + wxStaticBoxSizer * _result; + wxStaticBox * _arg0; + int _arg1 = (int ) wxHORIZONTAL; + PyObject * _argo0 = 0; + char *_kwnames[] = { "box","orient", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:new_wxStaticBoxSizer",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticBoxSizer. Expected _wxStaticBox_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxStaticBoxSizer *)new_wxStaticBoxSizer(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticBoxSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxStaticBoxSizer_GetStaticBox(_swigobj) (_swigobj->GetStaticBox()) +static PyObject *_wrap_wxStaticBoxSizer_GetStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxStaticBox * _result; + wxStaticBoxSizer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticBoxSizer_GetStaticBox",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStaticBoxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBoxSizer_GetStaticBox. Expected _wxStaticBoxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _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; + } + return _resultobj; +} + +static PyMethodDef sizerscMethods[] = { + { "wxStaticBoxSizer_GetStaticBox", (PyCFunction) _wrap_wxStaticBoxSizer_GetStaticBox, METH_VARARGS | METH_KEYWORDS }, + { "new_wxStaticBoxSizer", (PyCFunction) _wrap_new_wxStaticBoxSizer, 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 }, + { "new_wxPySizer", (PyCFunction) _wrap_new_wxPySizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_GetChildren", (PyCFunction) _wrap_wxSizer_GetChildren, 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 }, + { "wxSizer_GetMinSize", (PyCFunction) _wrap_wxSizer_GetMinSize, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_GetPosition", (PyCFunction) _wrap_wxSizer_GetPosition, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_GetSize", (PyCFunction) _wrap_wxSizer_GetSize, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_SetDimension", (PyCFunction) _wrap_wxSizer_SetDimension, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_RemovePos", (PyCFunction) _wrap_wxSizer_RemovePos, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_RemoveSizer", (PyCFunction) _wrap_wxSizer_RemoveSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_RemoveWindow", (PyCFunction) _wrap_wxSizer_RemoveWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_PrependSpacer", (PyCFunction) _wrap_wxSizer_PrependSpacer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_PrependSizer", (PyCFunction) _wrap_wxSizer_PrependSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_PrependWindow", (PyCFunction) _wrap_wxSizer_PrependWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizer_AddSpacer", (PyCFunction) _wrap_wxSizer_AddSpacer, METH_VARARGS | METH_KEYWORDS }, + { "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 }, + { "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetBorder", (PyCFunction) _wrap_wxSizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetFlag", (PyCFunction) _wrap_wxSizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetOption", (PyCFunction) _wrap_wxSizerItem_GetOption, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetSizer", (PyCFunction) _wrap_wxSizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_GetWindow", (PyCFunction) _wrap_wxSizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_IsSpacer", (PyCFunction) _wrap_wxSizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_IsSizer", (PyCFunction) _wrap_wxSizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxSizerItem_IsWindow", (PyCFunction) _wrap_wxSizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS }, + { "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 }, + { NULL, NULL } +}; +#ifdef __cplusplus +} +#endif +/* + * 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}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, + { "_wxPrintQuality","_int",0}, + { "_wxPrintQuality","_signed_int",0}, + { "_wxPrintQuality","_unsigned_int",0}, + { "_wxPrintQuality","_wxWindowID",0}, + { "_wxPrintQuality","_uint",0}, + { "_wxPrintQuality","_EBool",0}, + { "_wxPrintQuality","_size_t",0}, + { "_class_wxRegionIterator","_wxRegionIterator",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}, + { "_byte","_unsigned_char",0}, + { "_wxStaticBox","_class_wxStaticBox",0}, + { "_wxChoice","_class_wxChoice",0}, + { "_wxSlider","_class_wxSlider",0}, + { "_long","_wxDash",0}, + { "_long","_unsigned_long",0}, + { "_long","_signed_long",0}, + { "_wxImageList","_class_wxImageList",0}, + { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, + { "_wxBitmapButton","_class_wxBitmapButton",0}, + { "_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}, + { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, + { "_class_wxGauge","_wxGauge",0}, + { "_wxDC","_class_wxDC",0}, + { "_wxSizerItem","_class_wxSizerItem",0}, + { "_wxSpinEvent","_class_wxSpinEvent",0}, + { "_size_t","_wxPrintQuality",0}, + { "_size_t","_unsigned_int",0}, + { "_size_t","_int",0}, + { "_size_t","_wxWindowID",0}, + { "_size_t","_uint",0}, + { "_class_wxRealPoint","_wxRealPoint",0}, + { "_class_wxMenuItem","_wxMenuItem",0}, + { "_class_wxPaintEvent","_wxPaintEvent",0}, + { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, + { "_class_wxPySizer","_wxPySizer",0}, + { "_class_wxPostScriptDC","_wxPostScriptDC",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}, + { "_class_wxKeyEvent","_wxKeyEvent",0}, + { "_wxColour","_class_wxColour",0}, + { "_class_wxDialog","_wxDialog",0}, + { "_wxIdleEvent","_class_wxIdleEvent",0}, + { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, + { "_wxStaticLine","_class_wxStaticLine",0}, + { "_wxBrush","_class_wxBrush",0}, + { "_wxShowEvent","_class_wxShowEvent",0}, + { "_uint","_wxPrintQuality",0}, + { "_uint","_size_t",0}, + { "_uint","_unsigned_int",0}, + { "_uint","_int",0}, + { "_uint","_wxWindowID",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}, + { "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, + { "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, + { "_wxBoxSizer","_class_wxBoxSizer",0}, + { "_wxBitmap","_class_wxBitmap",0}, + { "_wxPyTimer","_class_wxPyTimer",0}, + { "_wxWindowDC","_class_wxWindowDC",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}, + { "_class_wxStaticLine","_wxStaticLine",0}, + { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_EBool","_wxPrintQuality",0}, + { "_EBool","_signed_int",0}, + { "_EBool","_int",0}, + { "_EBool","_wxWindowID",0}, + { "_class_wxRegion","_wxRegion",0}, + { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, + { "_wxStaticText","_class_wxStaticText",0}, + { "_wxFont","_class_wxFont",0}, + { "_wxCloseEvent","_class_wxCloseEvent",0}, + { "_unsigned_long","_wxDash",0}, + { "_unsigned_long","_long",0}, + { "_class_wxRect","_wxRect",0}, + { "_class_wxDC","_wxDC",0}, + { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, + { "_class_wxPyTimer","_wxPyTimer",0}, + { "_wxFocusEvent","_class_wxFocusEvent",0}, + { "_wxMaximizeEvent","_class_wxMaximizeEvent",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}, + { "_signed_int","_wxPrintQuality",0}, + { "_signed_int","_EBool",0}, + { "_signed_int","_wxWindowID",0}, + { "_signed_int","_int",0}, + { "_class_wxTextCtrl","_wxTextCtrl",0}, + { "_wxLayoutConstraints","_class_wxLayoutConstraints",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_wxBrush","_wxBrush",0}, + { "_unsigned_short","_WXTYPE",0}, + { "_unsigned_short","_short",0}, + { "_class_wxWindow","_wxWindow",0}, + { "_class_wxStaticText","_wxStaticText",0}, + { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, + { "_class_wxCloseEvent","_wxCloseEvent",0}, + { "_class_wxMenuEvent","_wxMenuEvent",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}, + { "_signed_short","_WXTYPE",0}, + { "_signed_short","_short",0}, + { "_wxMemoryDC","_class_wxMemoryDC",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}, + { "_wxPostScriptDC","_class_wxPostScriptDC",0}, + { "_wxScrolledWindow","_class_wxScrolledWindow",0}, + { "_unsigned_char","_byte",0}, + { "_class_wxMenu","_wxMenu",0}, + { "_wxControl","_class_wxControl",0}, + { "_class_wxListBox","_wxListBox",0}, + { "_unsigned_int","_wxPrintQuality",0}, + { "_unsigned_int","_size_t",0}, + { "_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_wxScrollEvent","_wxScrollEvent",0}, + { "_wxJoystickEvent","_class_wxJoystickEvent",0}, + { "_class_wxChoice","_wxChoice",0}, + { "_class_wxSlider","_wxSlider",0}, + { "_class_wxImageList","_wxImageList",0}, + { "_class_wxBitmapButton","_wxBitmapButton",0}, + { "_wxWindowID","_wxPrintQuality",0}, + { "_wxWindowID","_size_t",0}, + { "_wxWindowID","_EBool",0}, + { "_wxWindowID","_uint",0}, + { "_wxWindowID","_int",0}, + { "_wxWindowID","_signed_int",0}, + { "_wxWindowID","_unsigned_int",0}, + { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, + { "_class_wxSizerItem","_wxSizerItem",0}, + { "_int","_wxPrintQuality",0}, + { "_int","_size_t",0}, + { "_int","_EBool",0}, + { "_int","_uint",0}, + { "_int","_wxWindowID",0}, + { "_int","_unsigned_int",0}, + { "_int","_signed_int",0}, + { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, + { "_class_wxSpinEvent","_wxSpinEvent",0}, + { "_wxButton","_class_wxButton",0}, + { "_wxSize","_class_wxSize",0}, + { "_wxRegionIterator","_class_wxRegionIterator",0}, + { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, + { "_class_wxPaintDC","_wxPaintDC",0}, + { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",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}, + { "_wxEraseEvent","_class_wxEraseEvent",0}, + { "_class_wxJoystickEvent","_wxJoystickEvent",0}, + { "_wxRegion","_class_wxRegion",0}, + { "_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}, + { "_wxActivateEvent","_class_wxActivateEvent",0}, + { "_wxGauge","_class_wxGauge",0}, + { "_class_wxCheckListBox","_wxCheckListBox",0}, + { "_class_wxCommandEvent","_wxCommandEvent",0}, + { "_class_wxClientDC","_wxClientDC",0}, + { "_class_wxSizeEvent","_wxSizeEvent",0}, + { "_class_wxSize","_wxSize",0}, + { "_class_wxBitmap","_wxBitmap",0}, + { "_class_wxMemoryDC","_wxMemoryDC",0}, + { "_wxMenuBar","_class_wxMenuBar",0}, + { "_wxEvtHandler","_class_wxEvtHandler",0}, + { "_wxMenuItem","_class_wxMenuItem",0}, + { "_class_wxScrollBar","_wxScrollBar",0}, + { "_wxDash","_unsigned_long",0}, + { "_wxDash","_long",0}, + { "_class_wxScrolledWindow","_wxScrolledWindow",0}, + { "_wxKeyEvent","_class_wxKeyEvent",0}, + { "_wxMoveEvent","_class_wxMoveEvent",0}, + { "_class_wxPalette","_wxPalette",0}, + { "_class_wxEraseEvent","_wxEraseEvent",0}, + { "_wxWindow","_class_wxWindow",0}, +{0,0,0}}; + +static PyObject *SWIG_globals; +#ifdef __cplusplus +extern "C" +#endif +SWIGEXPORT(void) initsizersc() { + PyObject *m, *d; + SWIG_globals = SWIG_newvarlink(); + m = Py_InitModule("sizersc", sizerscMethods); + d = PyModule_GetDict(m); +{ + int i; + for (i = 0; _swig_mapping[i].n1; i++) + SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv); +} +} diff --git a/utils/wxPython/src/gtk/sizers.py b/utils/wxPython/src/gtk/sizers.py new file mode 100644 index 0000000000..5793ece3b4 --- /dev/null +++ b/utils/wxPython/src/gtk/sizers.py @@ -0,0 +1,229 @@ +# This file was created automatically by SWIG. +import sizersc + +from misc import * + +from windows import * + +from gdi import * + +from controls import * + +from events import * +import wx +import string +class wxSizerItemPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSize(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetSize,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def CalcMin(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_CalcMin,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def SetDimension(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_SetDimension,(self,) + _args, _kwargs) + return val + def IsWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_IsWindow,(self,) + _args, _kwargs) + return val + def IsSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_IsSizer,(self,) + _args, _kwargs) + return val + def IsSpacer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_IsSpacer,(self,) + _args, _kwargs) + return val + def GetWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs) + if val: val = wxWindowPtr(val) + return val + def GetSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs) + if val: val = wxSizerPtr(val) + return val + def GetOption(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetOption,(self,) + _args, _kwargs) + return val + def GetFlag(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetFlag,(self,) + _args, _kwargs) + return val + def GetBorder(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetBorder,(self,) + _args, _kwargs) + return val + def GetUserData(self, *_args, **_kwargs): + val = apply(sizersc.wxSizerItem_GetUserData,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxSizerItem(wxSizerItemPtr): + def __init__(self,this): + self.this = this + + + + +class wxSizerPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def Destroy(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_Destroy,(self,) + _args, _kwargs) + return val + def AddWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_AddWindow,(self,) + _args, _kwargs) + return val + def AddSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_AddSizer,(self,) + _args, _kwargs) + return val + def AddSpacer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_AddSpacer,(self,) + _args, _kwargs) + return val + def PrependWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_PrependWindow,(self,) + _args, _kwargs) + return val + def PrependSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_PrependSizer,(self,) + _args, _kwargs) + return val + def PrependSpacer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_PrependSpacer,(self,) + _args, _kwargs) + return val + def RemoveWindow(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_RemoveWindow,(self,) + _args, _kwargs) + return val + def RemoveSizer(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_RemoveSizer,(self,) + _args, _kwargs) + return val + def RemovePos(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_RemovePos,(self,) + _args, _kwargs) + return val + def SetDimension(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetDimension,(self,) + _args, _kwargs) + return val + def GetSize(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_GetSize,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def GetPosition(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_GetPosition,(self,) + _args, _kwargs) + if val: val = wxPointPtr(val) ; val.thisown = 1 + return val + def GetMinSize(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_GetMinSize,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def Layout(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_Layout,(self,) + _args, _kwargs) + return val + def Fit(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_Fit,(self,) + _args, _kwargs) + return val + def SetSizeHints(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_SetSizeHints,(self,) + _args, _kwargs) + return val + def GetChildren(self, *_args, **_kwargs): + val = apply(sizersc.wxSizer_GetChildren,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) + + def Add(self, *args): + if type(args[0]) == type(1): + apply(self.AddSpacer, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.AddSizer, args) + else: + apply(self.AddWindow, args) + + def Prepend(self, *args): + if type(args[0]) == type(1): + apply(self.PrependSpacer, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.PrependSizer, args) + else: + apply(self.PrependWindow, args) + + def Remove(self, *args): + if type(args[0]) == type(1): + apply(self.RemovePos, args) + elif string.find(args[0].this, 'Sizer') != -1: + apply(self.RemoveSizer, args) + else: + apply(self.RemoveWindow, args) + + def AddMany(self, widgets): + for childinfo in widgets: + if type(childinfo) != type(()): + childinfo = (childinfo, ) + apply(self.Add, childinfo) + +class wxSizer(wxSizerPtr): + def __init__(self,this): + self.this = this + + + + +class wxPySizerPtr(wxSizerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def _setSelf(self, *_args, **_kwargs): + val = apply(sizersc.wxPySizer__setSelf,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxPySizer(wxPySizerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(sizersc.new_wxPySizer,_args,_kwargs) + self.thisown = 1 + self._setSelf(self) + + + + +class wxBoxSizerPtr(wxSizerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetOrientation(self, *_args, **_kwargs): + val = apply(sizersc.wxBoxSizer_GetOrientation,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxBoxSizer(wxBoxSizerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(sizersc.new_wxBoxSizer,_args,_kwargs) + self.thisown = 1 + + + + +class wxStaticBoxSizerPtr(wxBoxSizerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetStaticBox(self, *_args, **_kwargs): + val = apply(sizersc.wxStaticBoxSizer_GetStaticBox,(self,) + _args, _kwargs) + if val: val = wxStaticBoxPtr(val) + return val + def __repr__(self): + return "" % (self.this,) +class wxStaticBoxSizer(wxStaticBoxSizerPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(sizersc.new_wxStaticBoxSizer,_args,_kwargs) + self.thisown = 1 + + + + + + +#-------------- FUNCTION WRAPPERS ------------------ + + + +#-------------- VARIABLE WRAPPERS ------------------ + diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp index b3f2c0f560..70c91de739 100644 --- a/utils/wxPython/src/gtk/stattool.cpp +++ b/utils/wxPython/src/gtk/stattool.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -146,13 +135,15 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject long _arg4 = (long ) wxST_SIZEGRIP; char * _arg5 = (char *) "statusBar"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -161,20 +152,18 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStatusBar. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStatusBar. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -1362,13 +1351,15 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k long _arg4 = (long ) wxTB_HORIZONTAL|wxNO_BORDER; char * _arg5 = (char *) "toolBar"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1377,20 +1368,18 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -1919,11 +1908,12 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyOb wxToolBar * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetMargins",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetMargins",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1932,13 +1922,11 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyOb return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxToolBar_SetMargins(_arg0,*_arg1); @@ -2105,6 +2093,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -2171,6 +2160,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxRect","_class_wxRect",0}, @@ -2187,6 +2177,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxToolBarTool","_class_wxToolBarTool",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}, @@ -2239,6 +2230,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -2299,6 +2291,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -2308,6 +2301,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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","_class_wxToolBar",SwigwxToolBarTowxControl}, diff --git a/utils/wxPython/src/gtk/windows.cpp b/utils/wxPython/src/gtk/windows.cpp index b06974e403..aa4cb1056a 100644 --- a/utils/wxPython/src/gtk/windows.cpp +++ b/utils/wxPython/src/gtk/windows.cpp @@ -103,21 +103,99 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } +static char* wxStringErrorMsg = "string type is required for parameter"; -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); + bool wxValidator_IsSilent() { + return wxValidator::IsSilent(); + } + void wxValidator_SetBellOnError(int doIt = TRUE) { + wxValidator::SetBellOnError(doIt); + } + +class wxPyValidator : public wxValidator { + DECLARE_DYNAMIC_CLASS(wxPyValidator); +public: + wxPyValidator() { + } +// wxPyValidator(const wxPyValidator& other); + + ~wxPyValidator() { + } + + wxObject* wxPyValidator::Clone() const { + wxPyValidator* ptr = NULL; + wxPyValidator* self = (wxPyValidator*)this; + + bool doSave = wxPyRestoreThread(); + if (self->m_myInst.findCallback("Clone")) { + PyObject* ro; + ro = self->m_myInst.callCallbackObj(Py_BuildValue("()")); + SWIG_GetPtrObj(ro, (void **)&ptr, "_wxPyValidator_p"); + } + // This is very dangerous!!! But is the only way I could find + // to squash a memory leak. Currently it is okay, but if the + // validator architecture in wxWindows ever changes, problems + // could arise. + delete self; + + wxPySaveThread(doSave); + return ptr; +} + + + DEC_PYCALLBACK_BOOL_WXWIN(Validate); + DEC_PYCALLBACK_BOOL_(TransferToWindow); + DEC_PYCALLBACK_BOOL_(TransferFromWindow); + + PYPRIVATE; +// PyObject* m_data; +}; + +IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate); +IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferToWindow); +IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferFromWindow); + +IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator); -static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { #endif +static PyObject *_wrap_wxValidator_IsSilent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxValidator_IsSilent",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxValidator_IsSilent(); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxValidator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _arg0 = (int ) TRUE; + char *_kwnames[] = { "doIt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:wxValidator_SetBellOnError",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxValidator_SetBellOnError(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxEvtHandler_ProcessEvent(_swigobj,_swigarg0) (_swigobj->ProcessEvent(_swigarg0)) static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -154,6 +232,203 @@ static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args, return _resultobj; } +#define wxEvtHandler_GetEvtHandlerEnabled(_swigobj) (_swigobj->GetEvtHandlerEnabled()) +static PyObject *_wrap_wxEvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxEvtHandler * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvtHandler_GetEvtHandlerEnabled",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_GetEvtHandlerEnabled. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxEvtHandler_GetEvtHandlerEnabled(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxEvtHandler_SetEvtHandlerEnabled(_swigobj,_swigarg0) (_swigobj->SetEvtHandlerEnabled(_swigarg0)) +static PyObject *_wrap_wxEvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","enabled", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvtHandler_SetEvtHandlerEnabled",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_SetEvtHandlerEnabled. Expected _wxEvtHandler_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxEvtHandler_SetEvtHandlerEnabled(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxEvtHandler_GetNextHandler(_swigobj) (_swigobj->GetNextHandler()) +static PyObject *_wrap_wxEvtHandler_GetNextHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _result; + wxEvtHandler * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvtHandler_GetNextHandler",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_GetNextHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxEvtHandler *)wxEvtHandler_GetNextHandler(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxEvtHandler_GetPreviousHandler(_swigobj) (_swigobj->GetPreviousHandler()) +static PyObject *_wrap_wxEvtHandler_GetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _result; + wxEvtHandler * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvtHandler_GetPreviousHandler",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_GetPreviousHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxEvtHandler *)wxEvtHandler_GetPreviousHandler(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvtHandler_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxEvtHandler_SetNextHandler(_swigobj,_swigarg0) (_swigobj->SetNextHandler(_swigarg0)) +static PyObject *_wrap_wxEvtHandler_SetNextHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _arg0; + wxEvtHandler * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","handler", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvtHandler_SetNextHandler",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_SetNextHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvtHandler_SetNextHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxEvtHandler_SetNextHandler(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxEvtHandler_SetPreviousHandler(_swigobj,_swigarg0) (_swigobj->SetPreviousHandler(_swigarg0)) +static PyObject *_wrap_wxEvtHandler_SetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxEvtHandler * _arg0; + wxEvtHandler * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","handler", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvtHandler_SetPreviousHandler",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxEvtHandler_SetPreviousHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxEvtHandler_SetPreviousHandler. Expected _wxEvtHandler_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxEvtHandler_SetPreviousHandler(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void wxEvtHandler_Connect(wxEvtHandler *self,int id,int lastId,int eventType,PyObject * func) { if (PyCallable_Check(func)) { self->Connect(id, lastId, eventType, @@ -195,6 +470,244 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args, PyOb return _resultobj; } +static void *SwigwxValidatorTowxEvtHandler(void *ptr) { + wxValidator *src; + wxEvtHandler *dest; + src = (wxValidator *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxValidator() (new wxValidator()) +static PyObject *_wrap_new_wxValidator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxValidator * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxValidator",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxValidator *)new_wxValidator(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxValidator_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxValidator_Clone(_swigobj) (_swigobj->Clone()) +static PyObject *_wrap_wxValidator_Clone(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxValidator * _result; + wxValidator * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxValidator_Clone",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxValidator_Clone. Expected _wxValidator_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxValidator *)wxValidator_Clone(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxValidator_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxValidator_GetWindow(_swigobj) (_swigobj->GetWindow()) +static PyObject *_wrap_wxValidator_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _result; + wxValidator * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxValidator_GetWindow",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxValidator_GetWindow. Expected _wxValidator_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxWindow *)wxValidator_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; + } + return _resultobj; +} + +#define wxValidator_SetWindow(_swigobj,_swigarg0) (_swigobj->SetWindow(_swigarg0)) +static PyObject *_wrap_wxValidator_SetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxValidator * _arg0; + wxWindow * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","window", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxValidator_SetWindow",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxValidator_SetWindow. Expected _wxValidator_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxValidator_SetWindow. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxValidator_SetWindow(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void *SwigwxPyValidatorTowxValidator(void *ptr) { + wxPyValidator *src; + wxValidator *dest; + src = (wxPyValidator *) ptr; + dest = (wxValidator *) src; + return (void *) dest; +} + +static void *SwigwxPyValidatorTowxEvtHandler(void *ptr) { + wxPyValidator *src; + wxEvtHandler *dest; + src = (wxPyValidator *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxPyValidator() (new wxPyValidator()) +static PyObject *_wrap_new_wxPyValidator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyValidator * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyValidator",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxPyValidator *)new_wxPyValidator(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyValidator_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static void wxPyValidator_Destroy(wxPyValidator *self) { delete self; } +static PyObject *_wrap_wxPyValidator_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyValidator * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyValidator_Destroy",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyValidator_Destroy. Expected _wxPyValidator_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyValidator_Destroy(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyValidator__setSelf(_swigobj,_swigarg0,_swigarg1) (_swigobj->_setSelf(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyValidator__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyValidator * _arg0; + PyObject * _arg1; + int _arg2 = (int ) TRUE; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","self","incref", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPyValidator__setSelf",_kwnames,&_argo0,&_obj1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyValidator__setSelf. Expected _wxPyValidator_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyValidator__setSelf(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxWindowTowxEvtHandler(void *ptr) { wxWindow *src; wxEvtHandler *dest; @@ -214,13 +727,15 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args, PyObject *kw long _arg4 = (long ) 0; char * _arg5 = (char *) "panel"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -229,20 +744,18 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args, PyObject *kw return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxWindow. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxWindow. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxWindow *)new_wxWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -455,12 +968,13 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args, P wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ClientToScreen",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ClientToScreen",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -469,13 +983,11 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args, P return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ClientToScreen. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxPoint (wxWindow_ClientToScreen(_arg0,*_arg1)); @@ -2070,11 +2582,12 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args, PyObject *k wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","point", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Move",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Move",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2083,13 +2596,11 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args, PyObject *k return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_Move(_arg0,*_arg1); @@ -2220,11 +2731,12 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args, PyObje wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","menu","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_PopupMenu",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_PopupMenu",_kwnames,&_argo0,&_argo1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2240,13 +2752,11 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args, PyObje return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p."); +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxWindow_PopupMenu(_arg0,_arg1,*_arg2); @@ -2291,11 +2801,12 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args, PyObject wxRect * _arg2 = (wxRect *) NULL; PyObject * _argo0 = 0; int tempbool1 = (int) TRUE; - PyObject * _argo2 = 0; + wxRect temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","eraseBackground","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iO:wxWindow_Refresh",_kwnames,&_argo0,&tempbool1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iO:wxWindow_Refresh",_kwnames,&_argo0,&tempbool1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2305,13 +2816,12 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args, PyObject } } _arg1 = (bool ) tempbool1; - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_Refresh. Expected _wxRect_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxRect_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_Refresh(_arg0,_arg1,_arg2); @@ -2443,12 +2953,13 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args, P wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ScreenToClient",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ScreenToClient",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2457,13 +2968,11 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args, P return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ScreenToClient. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxPoint (wxWindow_ScreenToClient(_arg0,*_arg1)); @@ -2482,11 +2991,12 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyO int _arg2; wxRect * _arg3 = (wxRect *) NULL; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; + wxRect temp; + PyObject * _obj3 = 0; char *_kwnames[] = { "self","dx","dy","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|O:wxWindow_ScrollWindow",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|O:wxWindow_ScrollWindow",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2495,13 +3005,12 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyO return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxWindow_ScrollWindow. Expected _wxRect_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxRect_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_ScrollWindow(_arg0,_arg1,_arg2,_arg3); @@ -2650,6 +3159,42 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args, P return _resultobj; } +#define wxWindow_UnsetConstraints(_swigobj,_swigarg0) (_swigobj->UnsetConstraints(_swigarg0)) +static PyObject *_wrap_wxWindow_UnsetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxLayoutConstraints * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","constraints", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_UnsetConstraints",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_UnsetConstraints. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxLayoutConstraints_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_UnsetConstraints. Expected _wxLayoutConstraints_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_UnsetConstraints(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_SetFocus(_swigobj) (_swigobj->SetFocus()) static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2677,6 +3222,33 @@ static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args, PyObjec return _resultobj; } +#define wxWindow_AcceptsFocus(_swigobj) (_swigobj->AcceptsFocus()) +static PyObject *_wrap_wxWindow_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_AcceptsFocus",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_AcceptsFocus. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxWindow_AcceptsFocus(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxWindow_SetFont(_swigobj,_swigarg0) (_swigobj->SetFont(_swigarg0)) static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2923,11 +3495,12 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args, PyObject wxWindow * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2936,13 +3509,11 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_SetSize(_arg0,*_arg1); @@ -2961,11 +3532,12 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args, PyOb wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pos", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetPosition",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetPosition",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -2974,13 +3546,11 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args, PyOb return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetPosition. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_SetPosition(_arg0,*_arg1); @@ -3059,11 +3629,12 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args, Py wxWindow * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetClientSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetClientSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3072,13 +3643,11 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args, Py return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxWindow_SetClientSize(_arg0,*_arg1); @@ -3348,12 +3917,13 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObj wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogPointToPixels",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogPointToPixels",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3362,13 +3932,11 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObj return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxPoint (wxWindow_ConvertDialogPointToPixels(_arg0,*_arg1)); @@ -3386,12 +3954,13 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObje wxWindow * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","sz", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogSizeToPixels",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogSizeToPixels",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3400,13 +3969,11 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxSize (wxWindow_ConvertDialogSizeToPixels(_arg0,*_arg1)); @@ -3424,12 +3991,13 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObje wxWindow * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelPointToDialog",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelPointToDialog",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3438,13 +4006,11 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObje return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxPoint (wxWindow_ConvertPixelPointToDialog(_arg0,*_arg1)); @@ -3462,12 +4028,13 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec wxWindow * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","sz", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelSizeToDialog",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelSizeToDialog",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3476,13 +4043,11 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = new wxSize (wxWindow_ConvertPixelSizeToDialog(_arg0,*_arg1)); @@ -3603,6 +4168,112 @@ static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args, PyObj return _resultobj; } +#define wxWindow_SetSizer(_swigobj,_swigarg0) (_swigobj->SetSizer(_swigarg0)) +static PyObject *_wrap_wxWindow_SetSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxSizer * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","sizer", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetSizer",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetSizer. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSizer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetSizer. Expected _wxSizer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_SetSizer(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxWindow_GetValidator(_swigobj) (_swigobj->GetValidator()) +static PyObject *_wrap_wxWindow_GetValidator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxValidator * _result; + wxWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetValidator",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetValidator. Expected _wxWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxValidator *)wxWindow_GetValidator(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxValidator_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxWindow_SetValidator(_swigobj,_swigarg0) (_swigobj->SetValidator(_swigarg0)) +static PyObject *_wrap_wxWindow_SetValidator(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxValidator * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","validator", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetValidator",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetValidator. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetValidator. Expected _wxValidator_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_SetValidator(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxPanelTowxWindow(void *ptr) { wxPanel *src; wxWindow *dest; @@ -3630,13 +4301,15 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwa long _arg4 = (long ) wxTAB_TRAVERSAL; char * _arg5 = (char *) "panel"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxPanel",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxPanel",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3645,20 +4318,18 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwa return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPanel. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPanel. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxPanel *)new_wxPanel(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -3808,13 +4479,15 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw char * _arg6 = (char *) "dialogBox"; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - PyObject * _argo3 = 0; - PyObject * _argo4 = 0; + wxPoint temp; + PyObject * _obj3 = 0; + wxSize temp0; + PyObject * _obj4 = 0; char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxDialog",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxDialog",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_arg5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3830,20 +4503,18 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kw } _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDialog. Expected _wxPoint_p."); + if (_obj3) +{ + _arg3 = &temp; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } - if (_argo4) { - if (_argo4 == Py_None) { _arg4 = NULL; } - else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDialog. Expected _wxSize_p."); +} + if (_obj4) +{ + _arg4 = &temp0; + if (! wxSize_helper(_obj4, &_arg4)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxDialog *)new_wxDialog(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,_arg6); @@ -4252,13 +4923,15 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyOb long _arg4 = (long ) wxHSCROLL|wxVSCROLL; char * _arg5 = (char *) "scrolledWindow"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxScrolledWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxScrolledWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4267,20 +4940,18 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyOb return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxScrolledWindow. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxScrolledWindow. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxScrolledWindow *)new_wxScrolledWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -6409,6 +7080,9 @@ static PyMethodDef windowscMethods[] = { { "wxPanel_GetDefaultItem", (PyCFunction) _wrap_wxPanel_GetDefaultItem, METH_VARARGS | METH_KEYWORDS }, { "wxPanel_InitDialog", (PyCFunction) _wrap_wxPanel_InitDialog, METH_VARARGS | METH_KEYWORDS }, { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetValidator", (PyCFunction) _wrap_wxWindow_SetValidator, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_GetValidator", (PyCFunction) _wrap_wxWindow_GetValidator, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetSizer", (PyCFunction) _wrap_wxWindow_SetSizer, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetToolTip", (PyCFunction) _wrap_wxWindow_GetToolTip, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetToolTip", (PyCFunction) _wrap_wxWindow_SetToolTip, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetToolTipString", (PyCFunction) _wrap_wxWindow_SetToolTipString, METH_VARARGS | METH_KEYWORDS }, @@ -6438,7 +7112,9 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetId", (PyCFunction) _wrap_wxWindow_SetId, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetForegroundColour", (PyCFunction) _wrap_wxWindow_SetForegroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetFont", (PyCFunction) _wrap_wxWindow_SetFont, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_AcceptsFocus", (PyCFunction) _wrap_wxWindow_AcceptsFocus, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetFocus", (PyCFunction) _wrap_wxWindow_SetFocus, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_UnsetConstraints", (PyCFunction) _wrap_wxWindow_UnsetConstraints, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetConstraints", (PyCFunction) _wrap_wxWindow_SetConstraints, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS }, @@ -6510,8 +7186,23 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_Center", (PyCFunction) _wrap_wxWindow_Center, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_CaptureMouse", (PyCFunction) _wrap_wxWindow_CaptureMouse, METH_VARARGS | METH_KEYWORDS }, { "new_wxWindow", (PyCFunction) _wrap_new_wxWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxPyValidator__setSelf", (PyCFunction) _wrap_wxPyValidator__setSelf, METH_VARARGS | METH_KEYWORDS }, + { "wxPyValidator_Destroy", (PyCFunction) _wrap_wxPyValidator_Destroy, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyValidator", (PyCFunction) _wrap_new_wxPyValidator, METH_VARARGS | METH_KEYWORDS }, + { "wxValidator_SetWindow", (PyCFunction) _wrap_wxValidator_SetWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxValidator_GetWindow", (PyCFunction) _wrap_wxValidator_GetWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxValidator_Clone", (PyCFunction) _wrap_wxValidator_Clone, METH_VARARGS | METH_KEYWORDS }, + { "new_wxValidator", (PyCFunction) _wrap_new_wxValidator, METH_VARARGS | METH_KEYWORDS }, { "wxEvtHandler_Connect", (PyCFunction) _wrap_wxEvtHandler_Connect, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_wxEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_SetNextHandler", (PyCFunction) _wrap_wxEvtHandler_SetNextHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_wxEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_GetNextHandler", (PyCFunction) _wrap_wxEvtHandler_GetNextHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_SetEvtHandlerEnabled", (PyCFunction) _wrap_wxEvtHandler_SetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxEvtHandler_GetEvtHandlerEnabled", (PyCFunction) _wrap_wxEvtHandler_GetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS }, { "wxEvtHandler_ProcessEvent", (PyCFunction) _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS }, + { "wxValidator_SetBellOnError", (PyCFunction) _wrap_wxValidator_SetBellOnError, METH_VARARGS | METH_KEYWORDS }, + { "wxValidator_IsSilent", (PyCFunction) _wrap_wxValidator_IsSilent, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus @@ -6544,6 +7235,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler}, { "_class_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler}, { "_class_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler}, + { "_class_wxEvtHandler","_class_wxPyValidator",SwigwxPyValidatorTowxEvtHandler}, + { "_class_wxEvtHandler","_wxPyValidator",SwigwxPyValidatorTowxEvtHandler}, + { "_class_wxEvtHandler","_class_wxValidator",SwigwxValidatorTowxEvtHandler}, + { "_class_wxEvtHandler","_wxValidator",SwigwxValidatorTowxEvtHandler}, { "_class_wxEvtHandler","_wxEvtHandler",0}, { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, @@ -6578,12 +7273,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_wxRect","_class_wxRect",0}, { "_wxPoint","_class_wxPoint",0}, { "_wxBitmap","_class_wxBitmap",0}, { "_wxPyTimer","_class_wxPyTimer",0}, { "_wxWindowDC","_class_wxWindowDC",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, + { "_class_wxValidator","_class_wxPyValidator",SwigwxPyValidatorTowxValidator}, + { "_class_wxValidator","_wxPyValidator",SwigwxPyValidatorTowxValidator}, + { "_class_wxValidator","_wxValidator",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, @@ -6622,6 +7321,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxWindow","_wxPanel",SwigwxPanelTowxWindow}, { "_class_wxWindow","_wxWindow",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_wxClientDC","_class_wxClientDC",0}, { "_class_wxPoint","_wxPoint",0}, { "_wxRealPoint","_class_wxRealPoint",0}, @@ -6665,6 +7365,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, { "_class_wxPaintDC","_wxPaintDC",0}, + { "_wxValidator","_class_wxPyValidator",SwigwxPyValidatorTowxValidator}, + { "_wxValidator","_wxPyValidator",SwigwxPyValidatorTowxValidator}, + { "_wxValidator","_class_wxValidator",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, { "_class_wxIcon","_wxIcon",0}, { "_class_wxColour","_wxColour",0}, @@ -6688,6 +7391,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxEvtHandler","_wxPanel",SwigwxPanelTowxEvtHandler}, { "_wxEvtHandler","_class_wxWindow",SwigwxWindowTowxEvtHandler}, { "_wxEvtHandler","_wxWindow",SwigwxWindowTowxEvtHandler}, + { "_wxEvtHandler","_class_wxPyValidator",SwigwxPyValidatorTowxEvtHandler}, + { "_wxEvtHandler","_wxPyValidator",SwigwxPyValidatorTowxEvtHandler}, + { "_wxEvtHandler","_class_wxValidator",SwigwxValidatorTowxEvtHandler}, + { "_wxEvtHandler","_wxValidator",SwigwxValidatorTowxEvtHandler}, { "_wxEvtHandler","_class_wxEvtHandler",0}, { "_wxMenuItem","_class_wxMenuItem",0}, { "_wxDash","_unsigned_long",0}, diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py index f048551867..0b86752065 100644 --- a/utils/wxPython/src/gtk/windows.py +++ b/utils/wxPython/src/gtk/windows.py @@ -25,6 +25,26 @@ class wxEvtHandlerPtr : def ProcessEvent(self, *_args, **_kwargs): val = apply(windowsc.wxEvtHandler_ProcessEvent,(self,) + _args, _kwargs) return val + def GetEvtHandlerEnabled(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_GetEvtHandlerEnabled,(self,) + _args, _kwargs) + return val + def SetEvtHandlerEnabled(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_SetEvtHandlerEnabled,(self,) + _args, _kwargs) + return val + def GetNextHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_GetNextHandler,(self,) + _args, _kwargs) + if val: val = wxEvtHandlerPtr(val) + return val + def GetPreviousHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs) + if val: val = wxEvtHandlerPtr(val) + return val + def SetNextHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_SetNextHandler,(self,) + _args, _kwargs) + return val + def SetPreviousHandler(self, *_args, **_kwargs): + val = apply(windowsc.wxEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs) + return val def Connect(self, *_args, **_kwargs): val = apply(windowsc.wxEvtHandler_Connect,(self,) + _args, _kwargs) return val @@ -37,6 +57,52 @@ class wxEvtHandler(wxEvtHandlerPtr): +class wxValidatorPtr(wxEvtHandlerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def Clone(self, *_args, **_kwargs): + val = apply(windowsc.wxValidator_Clone,(self,) + _args, _kwargs) + if val: val = wxValidatorPtr(val) + return val + def GetWindow(self, *_args, **_kwargs): + val = apply(windowsc.wxValidator_GetWindow,(self,) + _args, _kwargs) + if val: val = wxWindowPtr(val) + return val + def SetWindow(self, *_args, **_kwargs): + val = apply(windowsc.wxValidator_SetWindow,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxValidator(wxValidatorPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(windowsc.new_wxValidator,_args,_kwargs) + self.thisown = 1 + + + + +class wxPyValidatorPtr(wxValidatorPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def Destroy(self, *_args, **_kwargs): + val = apply(windowsc.wxPyValidator_Destroy,(self,) + _args, _kwargs) + return val + def _setSelf(self, *_args, **_kwargs): + val = apply(windowsc.wxPyValidator__setSelf,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxPyValidator(wxPyValidatorPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(windowsc.new_wxPyValidator,_args,_kwargs) + self.thisown = 1 + self._setSelf(self, 0) + + + + class wxWindowPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this @@ -268,9 +334,15 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetConstraints(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetConstraints,(self,) + _args, _kwargs) return val + def UnsetConstraints(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_UnsetConstraints,(self,) + _args, _kwargs) + return val def SetFocus(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetFocus,(self,) + _args, _kwargs) return val + def AcceptsFocus(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_AcceptsFocus,(self,) + _args, _kwargs) + return val def SetFont(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetFont,(self,) + _args, _kwargs) return val @@ -365,6 +437,16 @@ class wxWindowPtr(wxEvtHandlerPtr): val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs) if val: val = wxToolTipPtr(val) return val + def SetSizer(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetSizer,(self,) + _args, _kwargs) + return val + def GetValidator(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_GetValidator,(self,) + _args, _kwargs) + if val: val = wxValidatorPtr(val) + return val + def SetValidator(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetValidator,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxWindow(wxWindowPtr): @@ -690,6 +772,10 @@ class wxMenuItem(wxMenuItemPtr): #-------------- FUNCTION WRAPPERS ------------------ +wxValidator_IsSilent = windowsc.wxValidator_IsSilent + +wxValidator_SetBellOnError = windowsc.wxValidator_SetBellOnError + #-------------- VARIABLE WRAPPERS ------------------ diff --git a/utils/wxPython/src/gtk/windows2.cpp b/utils/wxPython/src/gtk/windows2.cpp index 394a181f4e..f2cf7af905 100644 --- a/utils/wxPython/src/gtk/windows2.cpp +++ b/utils/wxPython/src/gtk/windows2.cpp @@ -108,17 +108,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -653,13 +642,15 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwar long _arg4 = (long ) 0; char * _arg5 = (char *) "grid"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxGrid",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxGrid",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -668,20 +659,18 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwar return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxGrid. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxGrid. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxGrid *)new_wxGrid(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -3616,13 +3605,15 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject * long _arg4 = (long ) 0; char * _arg5 = (char *) "notebook"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxNotebook",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxNotebook",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3631,20 +3622,18 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject * return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxNotebook. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxNotebook. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxNotebook *)new_wxNotebook(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -4385,13 +4374,15 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb long _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN; char * _arg5 = (char *) "splitterWindow"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","point","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSplitterWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSplitterWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4400,20 +4391,18 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSplitterWindow. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSplitterWindow. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxSplitterWindow *)new_wxSplitterWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -5133,6 +5122,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -5207,6 +5197,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_class_wxSplitterEvent",SwigwxSplitterEventTowxEvent}, { "_class_wxEvent","_wxSplitterEvent",SwigwxSplitterEventTowxEvent}, { "_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent}, @@ -5236,6 +5227,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxNotifyEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_wxNotebookEvent",SwigwxNotebookEventTowxNotifyEvent}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, + { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, @@ -5294,6 +5286,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSplitterWindow","_class_wxSplitterWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxClientDC","_class_wxClientDC",0}, @@ -5354,6 +5347,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -5363,6 +5357,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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","_class_wxNotebook",SwigwxNotebookTowxControl}, diff --git a/utils/wxPython/src/gtk/windows3.cpp b/utils/wxPython/src/gtk/windows3.cpp index bce0e36b61..db89d696e7 100644 --- a/utils/wxPython/src/gtk/windows3.cpp +++ b/utils/wxPython/src/gtk/windows3.cpp @@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; #ifdef __cplusplus extern "C" { @@ -196,11 +185,12 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args, P wxSashEvent * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashEvent_SetDragRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashEvent_SetDragRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -209,13 +199,11 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args, P return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashEvent_SetDragRect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxSashEvent_SetDragRect(_arg0,*_arg1); @@ -337,13 +325,15 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject long _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D); char * _arg5 = (char *) "sashWindow"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -352,20 +342,18 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashWindow. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashWindow. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxSashWindow *)new_wxSashWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -981,11 +969,12 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject * wxQueryLayoutInfoEvent * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxQueryLayoutInfoEvent_SetSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxQueryLayoutInfoEvent_SetSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -994,13 +983,11 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxQueryLayoutInfoEvent_SetSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxQueryLayoutInfoEvent_SetSize(_arg0,*_arg1); @@ -1219,11 +1206,12 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject * wxCalculateLayoutEvent * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxCalculateLayoutEvent_SetRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxCalculateLayoutEvent_SetRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1232,13 +1220,11 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxCalculateLayoutEvent_SetRect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxCalculateLayoutEvent_SetRect(_arg0,*_arg1); @@ -1313,13 +1299,15 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py long _arg4 = (long ) wxCLIP_CHILDREN|(wxSW_3D); char * _arg5 = (char *) "layoutWindow"; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj2 = 0; + wxSize temp0; + PyObject * _obj3 = 0; char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashLayoutWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashLayoutWindow",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1328,20 +1316,18 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, Py return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSashLayoutWindow. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSashLayoutWindow. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (wxSashLayoutWindow *)new_wxSashLayoutWindow(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); @@ -1445,11 +1431,12 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec wxSashLayoutWindow * _arg0; wxSize * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxSize temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","size", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashLayoutWindow_SetDefaultSize",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashLayoutWindow_SetDefaultSize",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1458,13 +1445,11 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxSashLayoutWindow_SetDefaultSize. Expected _wxSize_p."); +{ + _arg1 = &temp; + if (! wxSize_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxSashLayoutWindow_SetDefaultSize(_arg0,*_arg1); @@ -1564,11 +1549,12 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject wxRect * _arg2 = (wxRect *) NULL; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - PyObject * _argo2 = 0; + wxRect temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","frame","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxLayoutAlgorithm_LayoutMDIFrame",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxLayoutAlgorithm_LayoutMDIFrame",_kwnames,&_argo0,&_argo1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1584,13 +1570,12 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxLayoutAlgorithm_LayoutMDIFrame. Expected _wxRect_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxRect_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; _result = (bool )wxLayoutAlgorithm_LayoutMDIFrame(_arg0,_arg1,_arg2); @@ -1760,6 +1745,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -1840,6 +1826,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_class_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, { "_class_wxEvent","_wxCalculateLayoutEvent",SwigwxCalculateLayoutEventTowxEvent}, { "_class_wxEvent","_class_wxQueryLayoutInfoEvent",SwigwxQueryLayoutInfoEventTowxEvent}, @@ -1867,6 +1854,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxToolBarTool","_class_wxToolBarTool",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}, @@ -1927,6 +1915,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSplitterWindow","_class_wxSplitterWindow",0}, { "_class_wxStaticText","_wxStaticText",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_wxSashEvent","_class_wxSashEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, @@ -1992,6 +1981,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_wxButton","_class_wxButton",0}, { "_wxSize","_class_wxSize",0}, @@ -2002,6 +1992,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_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}, diff --git a/utils/wxPython/src/gtk/wx.cpp b/utils/wxPython/src/gtk/wx.cpp index bcf7d591d9..deef5f82be 100644 --- a/utils/wxPython/src/gtk/wx.cpp +++ b/utils/wxPython/src/gtk/wx.cpp @@ -102,17 +102,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return target; } - -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - - static char* wxStringErrorMsg = "string type is required for parameter"; @@ -646,6 +635,7 @@ extern "C" SWIGEXPORT(void) initframesc(); extern "C" SWIGEXPORT(void) initwindows3c(); extern "C" SWIGEXPORT(void) initimagec(); extern "C" SWIGEXPORT(void) initprintfwc(); +extern "C" SWIGEXPORT(void) initsizersc(); #ifdef __cplusplus extern "C" { #endif @@ -1626,6 +1616,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, { "_class_wxJPEGHandler","_wxJPEGHandler",0}, + { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxBMPHandler","_class_wxBMPHandler",0}, { "_wxImage","_class_wxImage",0}, { "_wxPrintQuality","_int",0}, @@ -1640,11 +1631,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxRegionIterator","_wxRegionIterator",0}, { "_class_wxMenuBar","_wxMenuBar",0}, { "_class_wxPyTreeItemData","_wxPyTreeItemData",0}, + { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, { "_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler}, { "_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler}, { "_class_wxEvtHandler","_wxEvtHandler",0}, { "_wxPaintEvent","_class_wxPaintEvent",0}, { "_wxGIFHandler","_class_wxGIFHandler",0}, + { "_wxPySizer","_class_wxPySizer",0}, { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, @@ -1672,11 +1665,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, { "_wxBitmapButton","_class_wxBitmapButton",0}, { "_wxSashWindow","_class_wxSashWindow",0}, + { "_class_wxSizer","_wxSizer",0}, { "_class_wxPrintDialogData","_wxPrintDialogData",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_class_wxGauge","_wxGauge",0}, { "_class_wxSashEvent","_wxSashEvent",0}, { "_wxDC","_class_wxDC",0}, + { "_wxSizerItem","_class_wxSizerItem",0}, { "_wxListEvent","_class_wxListEvent",0}, { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0}, { "_wxProgressDialog","_class_wxProgressDialog",0}, @@ -1695,6 +1690,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, { "_class_wxStatusBar","_wxStatusBar",0}, { "_class_wxGIFHandler","_wxGIFHandler",0}, + { "_class_wxPySizer","_wxPySizer",0}, { "_class_wxPostScriptDC","_wxPostScriptDC",0}, { "_wxPanel","_class_wxPanel",0}, { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, @@ -1726,6 +1722,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_unsigned_int",0}, { "_uint","_int",0}, { "_uint","_wxWindowID",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, { "_wxSplitterEvent","_class_wxSplitterEvent",0}, @@ -1739,6 +1736,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxButton","_wxButton",0}, { "_wxRadioBox","_class_wxRadioBox",0}, { "_class_wxFontData","_wxFontData",0}, + { "_wxBoxSizer","_class_wxBoxSizer",0}, { "_class___wxPyCleanup","___wxPyCleanup",0}, { "_wxBitmap","_class_wxBitmap",0}, { "_wxPrintDialog","_class_wxPrintDialog",0}, @@ -1752,6 +1750,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_wxMessageDialog","_class_wxMessageDialog",0}, + { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, @@ -1818,6 +1817,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxStaticText","_wxStaticText",0}, { "_wxPrintDialogData","_class_wxPrintDialogData",0}, { "_class_wxFont","_wxFont",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_wxSashEvent","_class_wxSashEvent",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, @@ -1829,6 +1829,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRealPoint","_class_wxRealPoint",0}, { "_class_wxRadioBox","_wxRadioBox",0}, { "_wxGridCell","_class_wxGridCell",0}, + { "_class_wxBoxSizer","_wxBoxSizer",0}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_wxMemoryDC","_class_wxMemoryDC",0}, @@ -1883,6 +1884,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, + { "_class_wxSizerItem","_wxSizerItem",0}, { "_int","_wxPrintQuality",0}, { "_int","_size_t",0}, { "_int","_EBool",0}, @@ -1891,6 +1893,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, + { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, { "_class_wxListEvent","_wxListEvent",0}, { "_class_wxPrintPreview","_wxPrintPreview",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, @@ -1900,11 +1903,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRegionIterator","_class_wxRegionIterator",0}, { "_class_wxMDIParentFrame","_wxMDIParentFrame",0}, { "_wxPyTreeItemData","_class_wxPyTreeItemData",0}, + { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, { "_class_wxPaintDC","_wxPaintDC",0}, { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, + { "_wxValidator","_class_wxValidator",0}, { "_class_wxTreeItemId","_wxTreeItemId",0}, { "_wxTreeCtrl","_class_wxTreeCtrl",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, @@ -1924,6 +1929,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRegion","_class_wxRegion",0}, { "_class_wxSplitterWindow","_wxSplitterWindow",0}, { "_wxPreviewFrame","_class_wxPreviewFrame",0}, + { "_wxSizer","_class_wxSizer",0}, { "_class_wxShowEvent","_wxShowEvent",0}, { "_wxActivateEvent","_class_wxActivateEvent",0}, { "_wxGauge","_class_wxGauge",0}, @@ -2034,6 +2040,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxALIGN_CENTER", PyInt_FromLong((long) wxALIGN_CENTER)); PyDict_SetItemString(d,"wxALIGN_CENTRE", PyInt_FromLong((long) wxALIGN_CENTRE)); PyDict_SetItemString(d,"wxALIGN_RIGHT", PyInt_FromLong((long) wxALIGN_RIGHT)); + PyDict_SetItemString(d,"wxALIGN_BOTTOM", PyInt_FromLong((long) wxALIGN_BOTTOM)); + PyDict_SetItemString(d,"wxALIGN_TOP", PyInt_FromLong((long) wxALIGN_TOP)); PyDict_SetItemString(d,"wxLB_NEEDED_SB", PyInt_FromLong((long) wxLB_NEEDED_SB)); PyDict_SetItemString(d,"wxLB_ALWAYS_SB", PyInt_FromLong((long) wxLB_ALWAYS_SB)); PyDict_SetItemString(d,"wxLB_SORT", PyInt_FromLong((long) wxLB_SORT)); @@ -2608,6 +2616,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_INSERT_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_LIST_INSERT_ITEM)); PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_COL_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_COL_CLICK)); PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED)); + PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)); + PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)); PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); @@ -2616,7 +2626,8 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT)); PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)); - PyDict_SetItemString(d,"__version__", PyString_FromString("2.1b4")); + PyDict_SetItemString(d,"wxEVT_NAVIGATION_KEY", PyInt_FromLong((long) wxEVT_NAVIGATION_KEY)); + PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); @@ -2643,6 +2654,7 @@ SWIGEXPORT(void) initwxc() { initwindows3c(); initimagec(); initprintfwc(); + initsizersc(); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/utils/wxPython/src/gtk/wx.py b/utils/wxPython/src/gtk/wx.py index 507f439554..b0765d87e4 100644 --- a/utils/wxPython/src/gtk/wx.py +++ b/utils/wxPython/src/gtk/wx.py @@ -30,6 +30,8 @@ from windows3 import * from image import * from printfw import * + +from sizers import * class wxPyAppPtr(wxEvtHandlerPtr): def __init__(self,this): self.this = this @@ -210,6 +212,8 @@ wxALIGN_LEFT = wxc.wxALIGN_LEFT wxALIGN_CENTER = wxc.wxALIGN_CENTER wxALIGN_CENTRE = wxc.wxALIGN_CENTRE wxALIGN_RIGHT = wxc.wxALIGN_RIGHT +wxALIGN_BOTTOM = wxc.wxALIGN_BOTTOM +wxALIGN_TOP = wxc.wxALIGN_TOP wxLB_NEEDED_SB = wxc.wxLB_NEEDED_SB wxLB_ALWAYS_SB = wxc.wxLB_ALWAYS_SB wxLB_SORT = wxc.wxLB_SORT @@ -784,6 +788,8 @@ wxEVT_COMMAND_LIST_KEY_DOWN = wxc.wxEVT_COMMAND_LIST_KEY_DOWN wxEVT_COMMAND_LIST_INSERT_ITEM = wxc.wxEVT_COMMAND_LIST_INSERT_ITEM wxEVT_COMMAND_LIST_COL_CLICK = wxc.wxEVT_COMMAND_LIST_COL_CLICK wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxc.wxEVT_COMMAND_LIST_ITEM_ACTIVATED +wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxc.wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK +wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxc.wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK wxEVT_COMMAND_TAB_SEL_CHANGED = wxc.wxEVT_COMMAND_TAB_SEL_CHANGED wxEVT_COMMAND_TAB_SEL_CHANGING = wxc.wxEVT_COMMAND_TAB_SEL_CHANGING wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxc.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED @@ -792,6 +798,7 @@ wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxc.wxEVT_COMMAND_SPLITTER_SASH_POS_C wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxc.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED wxEVT_COMMAND_SPLITTER_UNSPLIT = wxc.wxEVT_COMMAND_SPLITTER_UNSPLIT wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxc.wxEVT_COMMAND_SPLITTER_DOUBLECLICKED +wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY __version__ = wxc.__version__ cvar = wxc.cvar wxPyDefaultPosition = wxPointPtr(wxc.cvar.wxPyDefaultPosition) @@ -1403,6 +1410,14 @@ def EVT_LIST_INSERT_ITEM(win, id, func): def EVT_LIST_COL_CLICK(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_LIST_COL_CLICK, func) +def EVT_LIST_ITEM_RIGHT_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, func) + +def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func): + win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func) + + + #wxSplitterWindow def EVT_SPLITTER_SASH_POS_CHANGING(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, func) @@ -1445,17 +1460,9 @@ wxPyDefaultPosition.Set(-1,-1) wxPyDefaultSize.Set(-1,-1) # aliases so that C++ documentation applies: -wxDefaultPosition = wxPyDefaultPosition -wxDefaultSize = wxPyDefaultSize - +wxDefaultPosition = wxPyDefaultPosition +wxDefaultSize = wxPyDefaultSize -# This is to cover up a bug in SWIG. We are redefining -# the shadow class that is generated for wxAcceleratorTable -# because SWIG incorrectly uses "arg0.this" -class wxAcceleratorTable(wxAcceleratorTablePtr): - def __init__(self,arg0) : - self.this = miscc.new_wxAcceleratorTable(arg0) - self.thisown = 1 #---------------------------------------------------------------------- # This helper function will take a wxPython object and convert it to @@ -1491,31 +1498,36 @@ def wxPyTypeCast(obj, typeStr): #---------------------------------------------------------------------- -## class wxPyStdOutWindow: -## def __init__(self, title = "wxPython: stdout/stderr"): -## self.frame = None -## self.title = title +class wxPyOnDemandOutputWindow: + def __init__(self, title = "wxPython: stdout/stderr"): + self.frame = None + self.title = title -## def write(self, str): -## if not self.frame: -## self.frame = wxFrame(NULL, -1, self.title) -## self.text = wxTextCtrl(self.frame, -1, "", wxPoint(0,0), wxDefaultSize, -## wxTE_MULTILINE|wxTE_READONLY) -## self.frame.SetSize(wxSize(450, 300)) -## self.frame.Show(true) -## EVT_CLOSE(self.frame, self.OnCloseWindow) -## self.text.AppendText(str) + def SetParent(self, parent): + self.parent = parent -## def OnCloseWindow(self, event): -## wxBell() -## self.frame.Destroy() -## self.frame = None -## self.text = None + def OnCloseWindow(self, event): + if self.frame != None: + self.frame.Destroy() + self.frame = None + self.text = None + + # this provides the file-like behaviour + def write(self, str): + if not self.frame: + self.frame = wxFrame(self.parent, -1, self.title) + self.text = wxTextCtrl(self.frame, -1, "", + style = wxTE_MULTILINE|wxTE_READONLY) + self.frame.SetSize(wxSize(450, 300)) + self.frame.Show(true) + EVT_CLOSE(self.frame, self.OnCloseWindow) + self.text.AppendText(str) + + def close(self): + self.frame = None + self.text = None -## def close(self): -## if self.frame: -## self.frame.Close(true) _defRedirect = (wxPlatform == '__WXMSW__') @@ -1525,6 +1537,7 @@ _defRedirect = (wxPlatform == '__WXMSW__') class wxApp(wxPyApp): error = 'wxApp.error' + outputWindowClass = wxPyOnDemandOutputWindow def __init__(self, redirect=_defRedirect, filename=None): wxPyApp.__init__(self) @@ -1532,7 +1545,6 @@ class wxApp(wxPyApp): self.saveStdio = (sys.stdout, sys.stderr) if redirect: self.RedirectStdio(filename) - # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) @@ -1543,12 +1555,22 @@ class wxApp(wxPyApp): except: pass + + def SetTopWindow(self, frame): + if self.stdioWin: + self.stdioWin.SetParent(frame) + sys.stdout = self.stdioWin #sys.stderr = + wxPyApp.SetTopWindow(self, frame) + + def MainLoop(self): + wxPyApp.MainLoop(self) + self.RestoreStdio() + def RedirectStdio(self, filename): if filename: sys.stdout = sys.stderr = open(filename, 'a') else: - raise self.error, 'wxPyStdOutWindow not yet implemented.' - #self.stdioWin = sys.stdout = sys.stderr = wxPyStdOutWindow() + self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow def RestoreStdio(self): sys.stdout, sys.stderr = self.saveStdio @@ -1556,6 +1578,7 @@ class wxApp(wxPyApp): self.stdioWin.close() + #---------------------------------------------------------------------------- # DO NOT hold any other references to this object. This is how we know when # to cleanup system resources that wxWin is holding... -- 2.45.2