From 7e08d4efc7e111d6389d5c00b5bd2b5e5afa657e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 2 Feb 2006 02:02:04 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/activex/activex_wrap.cpp | 9 +- wxPython/contrib/animate/gtk/animate_wrap.cpp | 3 +- wxPython/contrib/animate/mac/animate_wrap.cpp | 3 +- wxPython/contrib/animate/msw/animate_wrap.cpp | 5 +- wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 218 +- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 218 +- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 228 +- .../contrib/glcanvas/gtk/glcanvas_wrap.cpp | 3 +- .../contrib/glcanvas/mac/glcanvas_wrap.cpp | 3 +- .../contrib/glcanvas/msw/glcanvas_wrap.cpp | 5 +- wxPython/contrib/stc/gtk/stc_wrap.cpp | 52 +- wxPython/contrib/stc/mac/stc_wrap.cpp | 52 +- wxPython/contrib/stc/msw/stc_wrap.cpp | 56 +- wxPython/src/gtk/_controls.py | 249 ++- wxPython/src/gtk/_controls_wrap.cpp | 1907 +++++++++++++--- wxPython/src/gtk/_core.py | 61 +- wxPython/src/gtk/_core_wrap.cpp | 363 +++- wxPython/src/gtk/_gdi.py | 3 - wxPython/src/gtk/_gdi_wrap.cpp | 266 +-- wxPython/src/gtk/_misc.py | 46 +- wxPython/src/gtk/_misc_wrap.cpp | 249 ++- wxPython/src/gtk/_windows.py | 15 +- wxPython/src/gtk/_windows_wrap.cpp | 248 +-- wxPython/src/gtk/calendar_wrap.cpp | 5 +- wxPython/src/gtk/grid.py | 8 +- wxPython/src/gtk/grid_wrap.cpp | 106 +- wxPython/src/gtk/html.py | 1 - wxPython/src/gtk/html_wrap.cpp | 74 +- wxPython/src/gtk/media_wrap.cpp | 5 +- wxPython/src/gtk/webkit_wrap.cpp | 3 +- wxPython/src/gtk/wizard_wrap.cpp | 62 +- wxPython/src/gtk/xrc_wrap.cpp | 21 +- wxPython/src/mac/_controls.py | 249 ++- wxPython/src/mac/_controls_wrap.cpp | 1907 +++++++++++++--- wxPython/src/mac/_core.py | 61 +- wxPython/src/mac/_core_wrap.cpp | 363 +++- wxPython/src/mac/_gdi.py | 3 - wxPython/src/mac/_gdi_wrap.cpp | 266 +-- wxPython/src/mac/_misc.py | 46 +- wxPython/src/mac/_misc_wrap.cpp | 249 ++- wxPython/src/mac/_windows.py | 15 +- wxPython/src/mac/_windows_wrap.cpp | 248 +-- wxPython/src/mac/calendar_wrap.cpp | 5 +- wxPython/src/mac/grid.py | 8 +- wxPython/src/mac/grid_wrap.cpp | 106 +- wxPython/src/mac/html.py | 1 - wxPython/src/mac/html_wrap.cpp | 74 +- wxPython/src/mac/media_wrap.cpp | 5 +- wxPython/src/mac/webkit_wrap.cpp | 3 +- wxPython/src/mac/wizard_wrap.cpp | 62 +- wxPython/src/mac/xrc_wrap.cpp | 21 +- wxPython/src/msw/_controls.py | 249 ++- wxPython/src/msw/_controls_wrap.cpp | 1911 ++++++++++++++--- wxPython/src/msw/_core.py | 61 +- wxPython/src/msw/_core_wrap.cpp | 377 ++-- wxPython/src/msw/_gdi_wrap.cpp | 66 +- wxPython/src/msw/_misc.py | 45 +- wxPython/src/msw/_misc_wrap.cpp | 188 +- wxPython/src/msw/_windows.py | 13 +- wxPython/src/msw/_windows_wrap.cpp | 116 +- wxPython/src/msw/calendar_wrap.cpp | 7 +- wxPython/src/msw/grid.py | 8 +- wxPython/src/msw/grid_wrap.cpp | 112 +- wxPython/src/msw/html.py | 1 - wxPython/src/msw/html_wrap.cpp | 82 +- wxPython/src/msw/media_wrap.cpp | 9 +- wxPython/src/msw/webkit_wrap.cpp | 5 +- wxPython/src/msw/wizard_wrap.cpp | 64 +- wxPython/src/msw/xrc_wrap.cpp | 25 +- 69 files changed, 8498 insertions(+), 3080 deletions(-) diff --git a/wxPython/contrib/activex/activex_wrap.cpp b/wxPython/contrib/activex/activex_wrap.cpp index 991467c0ea..c9d46b10eb 100644 --- a/wxPython/contrib/activex/activex_wrap.cpp +++ b/wxPython/contrib/activex/activex_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1634,20 +1635,20 @@ static wxString CLSID_GetProgIDString(CLSID *self){ return str; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_short PyInt_FromLong /*@@*/ static wxString wxParamX_vt_type_get(wxParamX *self){ return _VARTYPEname(self->vt); } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ static bool wxParamXArray___nonzero__(wxParamXArray *self){ return self->size() > 0; } static int wxParamXArray___len__(wxParamXArray *self){ return self->size(); } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1686,7 +1687,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/animate/gtk/animate_wrap.cpp b/wxPython/contrib/animate/gtk/animate_wrap.cpp index 2aef6fbcbd..7358311d2b 100644 --- a/wxPython/contrib/animate/gtk/animate_wrap.cpp +++ b/wxPython/contrib/animate/gtk/animate_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1590,7 +1591,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/animate/mac/animate_wrap.cpp b/wxPython/contrib/animate/mac/animate_wrap.cpp index 2aef6fbcbd..7358311d2b 100644 --- a/wxPython/contrib/animate/mac/animate_wrap.cpp +++ b/wxPython/contrib/animate/mac/animate_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1590,7 +1591,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/animate/msw/animate_wrap.cpp b/wxPython/contrib/animate/msw/animate_wrap.cpp index c6acc4b969..e116062291 100644 --- a/wxPython/contrib/animate/msw/animate_wrap.cpp +++ b/wxPython/contrib/animate/msw/animate_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1551,7 +1552,7 @@ static swig_module_info swig_module = {swig_types, 98, 0, 0, 0, 0}; static const wxString wxPyAnimationControlNameStr(wxT("animationControl")); static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1590,7 +1591,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index e971eff4d2..597fa49653 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1634,21 +1635,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[200] #define SWIGTYPE_p_wxToolBarBase swig_types[201] #define SWIGTYPE_p_wxToolBarToolBase swig_types[202] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[203] -#define SWIGTYPE_p_wxTreeEvent swig_types[204] -#define SWIGTYPE_p_wxTreeItemId swig_types[205] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[206] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[207] -#define SWIGTYPE_p_wxValidator swig_types[208] -#define SWIGTYPE_p_wxWindow swig_types[209] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[210] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[211] -#define SWIGTYPE_p_wxXPMHandler swig_types[212] -#define SWIGTYPE_ptrdiff_t swig_types[213] -#define SWIGTYPE_std__ptrdiff_t swig_types[214] -#define SWIGTYPE_unsigned_int swig_types[215] -static swig_type_info *swig_types[217]; -static swig_module_info swig_module = {swig_types, 216, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[203] +#define SWIGTYPE_p_wxToolbookEvent swig_types[204] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[205] +#define SWIGTYPE_p_wxTreeEvent swig_types[206] +#define SWIGTYPE_p_wxTreeItemId swig_types[207] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[208] +#define SWIGTYPE_p_wxTreebook swig_types[209] +#define SWIGTYPE_p_wxTreebookEvent swig_types[210] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[211] +#define SWIGTYPE_p_wxValidator swig_types[212] +#define SWIGTYPE_p_wxWindow swig_types[213] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[214] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[215] +#define SWIGTYPE_p_wxXPMHandler swig_types[216] +#define SWIGTYPE_ptrdiff_t swig_types[217] +#define SWIGTYPE_std__ptrdiff_t swig_types[218] +#define SWIGTYPE_unsigned_int swig_types[219] +static swig_type_info *swig_types[221]; +static swig_module_info swig_module = {swig_types, 220, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1724,7 +1729,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1892,7 +1897,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2128,31 +2133,30 @@ static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItem return tup; } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ @@ -2201,7 +2205,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -4788,7 +4792,7 @@ static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4816,7 +4820,7 @@ static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4844,7 +4848,7 @@ static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -9166,6 +9170,9 @@ static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -9187,12 +9194,12 @@ static void *_p_wxPyPanelTo_p_wxWindow(void *x) { static void *_p_wxGenericDirCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxGenericDirCtrl *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9223,6 +9230,9 @@ static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { static void *_p_wxChoiceTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -9451,8 +9461,8 @@ static void *_p_wxRadioButtonTo_p_wxControl(void *x) { static void *_p_wxLEDNumberCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxLEDNumberCtrl *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -9466,6 +9476,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9532,8 +9545,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -9544,6 +9557,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -9622,6 +9638,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -9772,6 +9794,9 @@ static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { static void *_p_wxPyAppTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxPyApp *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -10198,6 +10223,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxFindReplaceDialogTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } @@ -10279,6 +10310,9 @@ static void *_p_wxCommandEventTo_p_wxObject(void *x) { static void *_p_wxPyCommandEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxPyCommandEvent *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxToolBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxToolBarBase *) ((wxToolBar *) x)); } @@ -10300,6 +10334,9 @@ static void *_p_wxMDIParentFrameTo_p_wxObject(void *x) { static void *_p_wxMenuBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -10348,18 +10385,21 @@ static void *_p_wxPyControlTo_p_wxEvtHandler(void *x) { static void *_p_wxGaugeTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxGauge *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToggleButton *) x)); } static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxChoiceTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -10612,6 +10652,12 @@ static void *_p_wxListbookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -10670,6 +10716,8 @@ static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, static swig_type_info _swigt__p_wxNotebookEvent = {"_p_wxNotebookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListbookEvent = {"_p_wxListbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxChoicebookEvent = {"_p_wxChoicebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListEvent = {"_p_wxListEvent", 0, 0, 0, 0}; @@ -10685,6 +10733,7 @@ static swig_type_info _swigt__p_wxBookCtrlBase = {"_p_wxBookCtrlBase", 0, 0, 0, static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxRadioButton = {"_p_wxRadioButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0}; @@ -10707,10 +10756,11 @@ static swig_type_info _swigt__p_wxSpinCtrl = {"_p_wxSpinCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticText = {"_p_wxStaticText", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSlider = {"_p_wxSlider", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSpinButton = {"_p_wxSpinButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxButton = {"_p_wxButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBitmapButton = {"_p_wxBitmapButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDatePickerCtrl = {"_p_wxDatePickerCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextCtrl = {"_p_wxTextCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDuplexMode = {"_p_wxDuplexMode", "enum wxDuplexMode *|wxDuplexMode *", 0, 0, 0}; @@ -10758,11 +10808,11 @@ static swig_type_info _swigt__p_wxPreviewCanvas = {"_p_wxPreviewCanvas", 0, 0, 0 static swig_type_info _swigt__p_wxMDIChildFrame = {"_p_wxMDIChildFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyWindow = {"_p_wxPyWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSplashScreen = {"_p_wxSplashScreen", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMessageDialog = {"_p_wxMessageDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxProgressDialog = {"_p_wxProgressDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFindReplaceDialog = {"_p_wxFindReplaceDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSingleChoiceDialog = {"_p_wxSingleChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextEntryDialog = {"_p_wxTextEntryDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPasswordEntryDialog = {"_p_wxPasswordEntryDialog", 0, 0, 0, 0}; @@ -10772,12 +10822,12 @@ static swig_type_info _swigt__p_wxMiniFrame = {"_p_wxMiniFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStatusBar = {"_p_wxStatusBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMDIParentFrame = {"_p_wxMDIParentFrame", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashWindow = {"_p_wxSashWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashLayoutWindow = {"_p_wxSashLayoutWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPopupWindow = {"_p_wxPopupWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyPopupTransientWindow = {"_p_wxPyPopupTransientWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTipWindow = {"_p_wxTipWindow", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyVScrolledWindow = {"_p_wxPyVScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyScrolledWindow = {"_p_wxPyScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", 0, 0, 0, 0}; @@ -10829,13 +10879,13 @@ static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPrintDialog = {"_p_wxPrintDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPageSetupDialog = {"_p_wxPageSetupDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxICOHandler = {"_p_wxICOHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; @@ -11069,10 +11119,14 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, &_swigt__p_wxTopLevelWindow, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, &_swigt__p_wxTreeListColumnInfo, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxWindow, @@ -11105,6 +11159,8 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxNotebookEvent[] = {{&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListbookEvent[] = {{&_swigt__p_wxListbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxChoicebookEvent[] = {{&_swigt__p_wxChoicebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = {{&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = {{&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListEvent[] = {{&_swigt__p_wxListEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11115,11 +11171,12 @@ static swig_cast_info _swigc__p_wxHelpEvent[] = {{&_swigt__p_wxHelpEvent, 0, 0, static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBookCtrlBase[] = {{&_swigt__p_wxBookCtrlBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBar[] = {{&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToggleButton[] = {{&_swigt__p_wxToggleButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRadioButton[] = {{&_swigt__p_wxRadioButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -11142,13 +11199,14 @@ static swig_cast_info _swigc__p_wxSpinCtrl[] = {{&_swigt__p_wxSpinCtrl, 0, 0, 0} static swig_cast_info _swigc__p_wxStaticText[] = {{&_swigt__p_wxStaticText, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = {{&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSlider[] = {{&_swigt__p_wxSlider, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = {{&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSpinButton[] = {{&_swigt__p_wxSpinButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = {{&_swigt__p_wxButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = {{&_swigt__p_wxBitmapButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDatePickerCtrl[] = {{&_swigt__p_wxDatePickerCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextCtrl[] = {{&_swigt__p_wxTextCtrl, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDuplexMode[] = { {&_swigt__p_wxDuplexMode, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashSplitEvent[] = { {&_swigt__p_wxDynamicSashSplitEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashUnifyEvent[] = { {&_swigt__p_wxDynamicSashUnifyEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11183,7 +11241,7 @@ static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigati static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewFrame[] = {{&_swigt__p_wxPyPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPreviewFrame[] = {{&_swigt__p_wxPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}}; @@ -11193,11 +11251,11 @@ static swig_cast_info _swigc__p_wxPreviewCanvas[] = {{&_swigt__p_wxPreviewCanvas static swig_cast_info _swigc__p_wxMDIChildFrame[] = {{&_swigt__p_wxMDIChildFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyWindow[] = {{&_swigt__p_wxPyWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMessageDialog[] = {{&_swigt__p_wxMessageDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxProgressDialog[] = {{&_swigt__p_wxProgressDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindReplaceDialog[] = {{&_swigt__p_wxFindReplaceDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSingleChoiceDialog[] = {{&_swigt__p_wxSingleChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextEntryDialog[] = {{&_swigt__p_wxTextEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPasswordEntryDialog[] = {{&_swigt__p_wxPasswordEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; @@ -11207,12 +11265,12 @@ static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, static swig_cast_info _swigc__p_wxFrame[] = {{&_swigt__p_wxFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStatusBar[] = {{&_swigt__p_wxStatusBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMDIParentFrame[] = {{&_swigt__p_wxMDIParentFrame, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashWindow[] = {{&_swigt__p_wxSashWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashLayoutWindow[] = {{&_swigt__p_wxSashLayoutWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPopupWindow[] = {{&_swigt__p_wxPopupWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPopupTransientWindow[] = {{&_swigt__p_wxPyPopupTransientWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTipWindow[] = {{&_swigt__p_wxTipWindow, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyVScrolledWindow[] = {{&_swigt__p_wxPyVScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyScrolledWindow[] = {{&_swigt__p_wxPyScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTopLevelWindow[] = {{&_swigt__p_wxTopLevelWindow, 0, 0, 0},{0, 0, 0, 0}}; @@ -11226,7 +11284,7 @@ static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0 static swig_cast_info _swigc__p_wxPreviewControlBar[] = {{&_swigt__p_wxPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewControlBar[] = {{&_swigt__p_wxPyPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageList[] = { {&_swigt__p_wxImageList, 0, 0, 0},{0, 0, 0, 0}}; @@ -11264,13 +11322,13 @@ static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintDialog[] = {{&_swigt__p_wxPrintDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPageSetupDialog[] = {{&_swigt__p_wxPageSetupDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxICOHandler[] = {{&_swigt__p_wxICOHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -11278,7 +11336,7 @@ static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; @@ -11296,7 +11354,7 @@ static swig_cast_info _swigc__p_wxThinSplitterWindow[] = { {&_swigt__p_wxThinSp static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeListColumnInfo[] = { {&_swigt__p_wxTreeListColumnInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -11505,10 +11563,14 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, _swigc__p_wxTopLevelWindow, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, _swigc__p_wxTreeListColumnInfo, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxWindow, diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 8345b94c45..9a3ed201fc 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1634,21 +1635,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[200] #define SWIGTYPE_p_wxToolBarBase swig_types[201] #define SWIGTYPE_p_wxToolBarToolBase swig_types[202] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[203] -#define SWIGTYPE_p_wxTreeEvent swig_types[204] -#define SWIGTYPE_p_wxTreeItemId swig_types[205] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[206] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[207] -#define SWIGTYPE_p_wxValidator swig_types[208] -#define SWIGTYPE_p_wxWindow swig_types[209] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[210] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[211] -#define SWIGTYPE_p_wxXPMHandler swig_types[212] -#define SWIGTYPE_ptrdiff_t swig_types[213] -#define SWIGTYPE_std__ptrdiff_t swig_types[214] -#define SWIGTYPE_unsigned_int swig_types[215] -static swig_type_info *swig_types[217]; -static swig_module_info swig_module = {swig_types, 216, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[203] +#define SWIGTYPE_p_wxToolbookEvent swig_types[204] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[205] +#define SWIGTYPE_p_wxTreeEvent swig_types[206] +#define SWIGTYPE_p_wxTreeItemId swig_types[207] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[208] +#define SWIGTYPE_p_wxTreebook swig_types[209] +#define SWIGTYPE_p_wxTreebookEvent swig_types[210] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[211] +#define SWIGTYPE_p_wxValidator swig_types[212] +#define SWIGTYPE_p_wxWindow swig_types[213] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[214] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[215] +#define SWIGTYPE_p_wxXPMHandler swig_types[216] +#define SWIGTYPE_ptrdiff_t swig_types[217] +#define SWIGTYPE_std__ptrdiff_t swig_types[218] +#define SWIGTYPE_unsigned_int swig_types[219] +static swig_type_info *swig_types[221]; +static swig_module_info swig_module = {swig_types, 220, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1724,7 +1729,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1892,7 +1897,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2128,31 +2133,30 @@ static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItem return tup; } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ @@ -2201,7 +2205,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -4788,7 +4792,7 @@ static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4816,7 +4820,7 @@ static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4844,7 +4848,7 @@ static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -9166,6 +9170,9 @@ static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -9187,12 +9194,12 @@ static void *_p_wxPyPanelTo_p_wxWindow(void *x) { static void *_p_wxGenericDirCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxGenericDirCtrl *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9223,6 +9230,9 @@ static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { static void *_p_wxChoiceTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -9451,8 +9461,8 @@ static void *_p_wxRadioButtonTo_p_wxControl(void *x) { static void *_p_wxLEDNumberCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxLEDNumberCtrl *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -9466,6 +9476,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9532,8 +9545,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -9544,6 +9557,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -9622,6 +9638,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -9772,6 +9794,9 @@ static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { static void *_p_wxPyAppTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxPyApp *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -10198,6 +10223,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxFindReplaceDialogTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } @@ -10279,6 +10310,9 @@ static void *_p_wxCommandEventTo_p_wxObject(void *x) { static void *_p_wxPyCommandEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxPyCommandEvent *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxToolBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxToolBarBase *) ((wxToolBar *) x)); } @@ -10300,6 +10334,9 @@ static void *_p_wxMDIParentFrameTo_p_wxObject(void *x) { static void *_p_wxMenuBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -10348,18 +10385,21 @@ static void *_p_wxPyControlTo_p_wxEvtHandler(void *x) { static void *_p_wxGaugeTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxGauge *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToggleButton *) x)); } static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxChoiceTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -10612,6 +10652,12 @@ static void *_p_wxListbookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -10670,6 +10716,8 @@ static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, static swig_type_info _swigt__p_wxNotebookEvent = {"_p_wxNotebookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListbookEvent = {"_p_wxListbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxChoicebookEvent = {"_p_wxChoicebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListEvent = {"_p_wxListEvent", 0, 0, 0, 0}; @@ -10685,6 +10733,7 @@ static swig_type_info _swigt__p_wxBookCtrlBase = {"_p_wxBookCtrlBase", 0, 0, 0, static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxRadioButton = {"_p_wxRadioButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0}; @@ -10707,10 +10756,11 @@ static swig_type_info _swigt__p_wxSpinCtrl = {"_p_wxSpinCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticText = {"_p_wxStaticText", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSlider = {"_p_wxSlider", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSpinButton = {"_p_wxSpinButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxButton = {"_p_wxButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBitmapButton = {"_p_wxBitmapButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDatePickerCtrl = {"_p_wxDatePickerCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextCtrl = {"_p_wxTextCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDuplexMode = {"_p_wxDuplexMode", "enum wxDuplexMode *|wxDuplexMode *", 0, 0, 0}; @@ -10758,11 +10808,11 @@ static swig_type_info _swigt__p_wxPreviewCanvas = {"_p_wxPreviewCanvas", 0, 0, 0 static swig_type_info _swigt__p_wxMDIChildFrame = {"_p_wxMDIChildFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyWindow = {"_p_wxPyWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSplashScreen = {"_p_wxSplashScreen", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMessageDialog = {"_p_wxMessageDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxProgressDialog = {"_p_wxProgressDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFindReplaceDialog = {"_p_wxFindReplaceDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSingleChoiceDialog = {"_p_wxSingleChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextEntryDialog = {"_p_wxTextEntryDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPasswordEntryDialog = {"_p_wxPasswordEntryDialog", 0, 0, 0, 0}; @@ -10772,12 +10822,12 @@ static swig_type_info _swigt__p_wxMiniFrame = {"_p_wxMiniFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStatusBar = {"_p_wxStatusBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMDIParentFrame = {"_p_wxMDIParentFrame", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashWindow = {"_p_wxSashWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashLayoutWindow = {"_p_wxSashLayoutWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPopupWindow = {"_p_wxPopupWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyPopupTransientWindow = {"_p_wxPyPopupTransientWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTipWindow = {"_p_wxTipWindow", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyVScrolledWindow = {"_p_wxPyVScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyScrolledWindow = {"_p_wxPyScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", 0, 0, 0, 0}; @@ -10829,13 +10879,13 @@ static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPrintDialog = {"_p_wxPrintDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPageSetupDialog = {"_p_wxPageSetupDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxICOHandler = {"_p_wxICOHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; @@ -11069,10 +11119,14 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, &_swigt__p_wxTopLevelWindow, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, &_swigt__p_wxTreeListColumnInfo, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxWindow, @@ -11105,6 +11159,8 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxNotebookEvent[] = {{&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListbookEvent[] = {{&_swigt__p_wxListbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxChoicebookEvent[] = {{&_swigt__p_wxChoicebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = {{&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = {{&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListEvent[] = {{&_swigt__p_wxListEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11115,11 +11171,12 @@ static swig_cast_info _swigc__p_wxHelpEvent[] = {{&_swigt__p_wxHelpEvent, 0, 0, static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBookCtrlBase[] = {{&_swigt__p_wxBookCtrlBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBar[] = {{&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToggleButton[] = {{&_swigt__p_wxToggleButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRadioButton[] = {{&_swigt__p_wxRadioButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -11142,13 +11199,14 @@ static swig_cast_info _swigc__p_wxSpinCtrl[] = {{&_swigt__p_wxSpinCtrl, 0, 0, 0} static swig_cast_info _swigc__p_wxStaticText[] = {{&_swigt__p_wxStaticText, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = {{&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSlider[] = {{&_swigt__p_wxSlider, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = {{&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSpinButton[] = {{&_swigt__p_wxSpinButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = {{&_swigt__p_wxButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = {{&_swigt__p_wxBitmapButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDatePickerCtrl[] = {{&_swigt__p_wxDatePickerCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextCtrl[] = {{&_swigt__p_wxTextCtrl, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDuplexMode[] = { {&_swigt__p_wxDuplexMode, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashSplitEvent[] = { {&_swigt__p_wxDynamicSashSplitEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashUnifyEvent[] = { {&_swigt__p_wxDynamicSashUnifyEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11183,7 +11241,7 @@ static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigati static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewFrame[] = {{&_swigt__p_wxPyPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPreviewFrame[] = {{&_swigt__p_wxPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}}; @@ -11193,11 +11251,11 @@ static swig_cast_info _swigc__p_wxPreviewCanvas[] = {{&_swigt__p_wxPreviewCanvas static swig_cast_info _swigc__p_wxMDIChildFrame[] = {{&_swigt__p_wxMDIChildFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyWindow[] = {{&_swigt__p_wxPyWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMessageDialog[] = {{&_swigt__p_wxMessageDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxProgressDialog[] = {{&_swigt__p_wxProgressDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindReplaceDialog[] = {{&_swigt__p_wxFindReplaceDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSingleChoiceDialog[] = {{&_swigt__p_wxSingleChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextEntryDialog[] = {{&_swigt__p_wxTextEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPasswordEntryDialog[] = {{&_swigt__p_wxPasswordEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; @@ -11207,12 +11265,12 @@ static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, static swig_cast_info _swigc__p_wxFrame[] = {{&_swigt__p_wxFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStatusBar[] = {{&_swigt__p_wxStatusBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMDIParentFrame[] = {{&_swigt__p_wxMDIParentFrame, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashWindow[] = {{&_swigt__p_wxSashWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashLayoutWindow[] = {{&_swigt__p_wxSashLayoutWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPopupWindow[] = {{&_swigt__p_wxPopupWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPopupTransientWindow[] = {{&_swigt__p_wxPyPopupTransientWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTipWindow[] = {{&_swigt__p_wxTipWindow, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyVScrolledWindow[] = {{&_swigt__p_wxPyVScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyScrolledWindow[] = {{&_swigt__p_wxPyScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTopLevelWindow[] = {{&_swigt__p_wxTopLevelWindow, 0, 0, 0},{0, 0, 0, 0}}; @@ -11226,7 +11284,7 @@ static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0 static swig_cast_info _swigc__p_wxPreviewControlBar[] = {{&_swigt__p_wxPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewControlBar[] = {{&_swigt__p_wxPyPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageList[] = { {&_swigt__p_wxImageList, 0, 0, 0},{0, 0, 0, 0}}; @@ -11264,13 +11322,13 @@ static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintDialog[] = {{&_swigt__p_wxPrintDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPageSetupDialog[] = {{&_swigt__p_wxPageSetupDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxICOHandler[] = {{&_swigt__p_wxICOHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -11278,7 +11336,7 @@ static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; @@ -11296,7 +11354,7 @@ static swig_cast_info _swigc__p_wxThinSplitterWindow[] = { {&_swigt__p_wxThinSp static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeListColumnInfo[] = { {&_swigt__p_wxTreeListColumnInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -11505,10 +11563,14 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, _swigc__p_wxTopLevelWindow, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, _swigc__p_wxTreeListColumnInfo, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxWindow, diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index cee40d76f6..7f4d02313a 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1634,21 +1635,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[200] #define SWIGTYPE_p_wxToolBarBase swig_types[201] #define SWIGTYPE_p_wxToolBarToolBase swig_types[202] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[203] -#define SWIGTYPE_p_wxTreeEvent swig_types[204] -#define SWIGTYPE_p_wxTreeItemId swig_types[205] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[206] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[207] -#define SWIGTYPE_p_wxValidator swig_types[208] -#define SWIGTYPE_p_wxWindow swig_types[209] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[210] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[211] -#define SWIGTYPE_p_wxXPMHandler swig_types[212] -#define SWIGTYPE_ptrdiff_t swig_types[213] -#define SWIGTYPE_std__ptrdiff_t swig_types[214] -#define SWIGTYPE_unsigned_int swig_types[215] -static swig_type_info *swig_types[217]; -static swig_module_info swig_module = {swig_types, 216, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[203] +#define SWIGTYPE_p_wxToolbookEvent swig_types[204] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[205] +#define SWIGTYPE_p_wxTreeEvent swig_types[206] +#define SWIGTYPE_p_wxTreeItemId swig_types[207] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[208] +#define SWIGTYPE_p_wxTreebook swig_types[209] +#define SWIGTYPE_p_wxTreebookEvent swig_types[210] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[211] +#define SWIGTYPE_p_wxValidator swig_types[212] +#define SWIGTYPE_p_wxWindow swig_types[213] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[214] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[215] +#define SWIGTYPE_p_wxXPMHandler swig_types[216] +#define SWIGTYPE_ptrdiff_t swig_types[217] +#define SWIGTYPE_std__ptrdiff_t swig_types[218] +#define SWIGTYPE_unsigned_int swig_types[219] +static swig_type_info *swig_types[221]; +static swig_module_info swig_module = {swig_types, 220, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1685,7 +1690,7 @@ static swig_module_info swig_module = {swig_types, 216, 0, 0, 0, 0}; static const wxString wxPyStaticPictureNameStr(wxStaticPictureNameStr); static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1724,7 +1729,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1892,7 +1897,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1966,17 +1971,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl) - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -2128,31 +2133,30 @@ static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItem return tup; } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ @@ -2201,7 +2205,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2250,7 +2254,7 @@ SWIG_Check_float(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_float PyFloat_FromDouble /*@@*/ @@ -4788,7 +4792,7 @@ static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4816,7 +4820,7 @@ static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -4844,7 +4848,7 @@ static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *, PyObject *ar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -9166,6 +9170,9 @@ static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) { static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -9187,12 +9194,12 @@ static void *_p_wxPyPanelTo_p_wxWindow(void *x) { static void *_p_wxGenericDirCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxGenericDirCtrl *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9223,6 +9230,9 @@ static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { static void *_p_wxChoiceTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -9451,8 +9461,8 @@ static void *_p_wxRadioButtonTo_p_wxControl(void *x) { static void *_p_wxLEDNumberCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxLEDNumberCtrl *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -9466,6 +9476,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxControlWithItems *)(wxChoice *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxPyTreeListCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxPyTreeListCtrl *) x)); } @@ -9532,8 +9545,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -9544,6 +9557,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -9622,6 +9638,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -9772,6 +9794,9 @@ static void *_p_wxLayoutAlgorithmTo_p_wxObject(void *x) { static void *_p_wxPyAppTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxPyApp *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -10198,6 +10223,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxFindReplaceDialogTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } @@ -10279,6 +10310,9 @@ static void *_p_wxCommandEventTo_p_wxObject(void *x) { static void *_p_wxPyCommandEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxPyCommandEvent *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxToolBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxToolBarBase *) ((wxToolBar *) x)); } @@ -10300,6 +10334,9 @@ static void *_p_wxMDIParentFrameTo_p_wxObject(void *x) { static void *_p_wxMenuBarTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *) ((wxMenuBar *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxPyPreviewFrameTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } @@ -10348,18 +10385,21 @@ static void *_p_wxPyControlTo_p_wxEvtHandler(void *x) { static void *_p_wxGaugeTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxGauge *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToggleButton *) x)); } static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxChoiceTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxControlWithItems *) ((wxChoice *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -10612,6 +10652,12 @@ static void *_p_wxListbookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -10670,6 +10716,8 @@ static swig_type_info _swigt__p_wxChildFocusEvent = {"_p_wxChildFocusEvent", 0, static swig_type_info _swigt__p_wxNotebookEvent = {"_p_wxNotebookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListbookEvent = {"_p_wxListbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxChoicebookEvent = {"_p_wxChoicebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxListEvent = {"_p_wxListEvent", 0, 0, 0, 0}; @@ -10685,6 +10733,7 @@ static swig_type_info _swigt__p_wxBookCtrlBase = {"_p_wxBookCtrlBase", 0, 0, 0, static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxRadioButton = {"_p_wxRadioButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0}; @@ -10707,10 +10756,11 @@ static swig_type_info _swigt__p_wxSpinCtrl = {"_p_wxSpinCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticText = {"_p_wxStaticText", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStaticBox = {"_p_wxStaticBox", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSlider = {"_p_wxSlider", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSpinButton = {"_p_wxSpinButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxButton = {"_p_wxButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBitmapButton = {"_p_wxBitmapButton", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxContextHelpButton = {"_p_wxContextHelpButton", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDatePickerCtrl = {"_p_wxDatePickerCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextCtrl = {"_p_wxTextCtrl", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDuplexMode = {"_p_wxDuplexMode", "enum wxDuplexMode *|wxDuplexMode *", 0, 0, 0}; @@ -10758,11 +10808,11 @@ static swig_type_info _swigt__p_wxPreviewCanvas = {"_p_wxPreviewCanvas", 0, 0, 0 static swig_type_info _swigt__p_wxMDIChildFrame = {"_p_wxMDIChildFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyWindow = {"_p_wxPyWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSplashScreen = {"_p_wxSplashScreen", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMessageDialog = {"_p_wxMessageDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxProgressDialog = {"_p_wxProgressDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFindReplaceDialog = {"_p_wxFindReplaceDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxFileDialog = {"_p_wxFileDialog", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxMultiChoiceDialog = {"_p_wxMultiChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSingleChoiceDialog = {"_p_wxSingleChoiceDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTextEntryDialog = {"_p_wxTextEntryDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPasswordEntryDialog = {"_p_wxPasswordEntryDialog", 0, 0, 0, 0}; @@ -10772,12 +10822,12 @@ static swig_type_info _swigt__p_wxMiniFrame = {"_p_wxMiniFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStatusBar = {"_p_wxStatusBar", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMDIParentFrame = {"_p_wxMDIParentFrame", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashWindow = {"_p_wxSashWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSashLayoutWindow = {"_p_wxSashLayoutWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPopupWindow = {"_p_wxPopupWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyPopupTransientWindow = {"_p_wxPyPopupTransientWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTipWindow = {"_p_wxTipWindow", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxSplashScreenWindow = {"_p_wxSplashScreenWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyVScrolledWindow = {"_p_wxPyVScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyScrolledWindow = {"_p_wxPyScrolledWindow", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTopLevelWindow = {"_p_wxTopLevelWindow", 0, 0, 0, 0}; @@ -10829,13 +10879,13 @@ static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPrintDialog = {"_p_wxPrintDialog", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPageSetupDialog = {"_p_wxPageSetupDialog", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPNGHandler = {"_p_wxPNGHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxANIHandler = {"_p_wxANIHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxCURHandler = {"_p_wxCURHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxICOHandler = {"_p_wxICOHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; @@ -11069,10 +11119,14 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, &_swigt__p_wxTopLevelWindow, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, &_swigt__p_wxTreeListColumnInfo, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxWindow, @@ -11105,6 +11159,8 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxNotebookEvent[] = {{&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListbookEvent[] = {{&_swigt__p_wxListbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxChoicebookEvent[] = {{&_swigt__p_wxChoicebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = {{&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = {{&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxListEvent[] = {{&_swigt__p_wxListEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11115,11 +11171,12 @@ static swig_cast_info _swigc__p_wxHelpEvent[] = {{&_swigt__p_wxHelpEvent, 0, 0, static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindDialogEvent[] = {{&_swigt__p_wxFindDialogEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBookCtrlBase[] = {{&_swigt__p_wxBookCtrlBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBar[] = {{&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToggleButton[] = {{&_swigt__p_wxToggleButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRadioButton[] = {{&_swigt__p_wxRadioButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -11142,13 +11199,14 @@ static swig_cast_info _swigc__p_wxSpinCtrl[] = {{&_swigt__p_wxSpinCtrl, 0, 0, 0} static swig_cast_info _swigc__p_wxStaticText[] = {{&_swigt__p_wxStaticText, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStaticBox[] = {{&_swigt__p_wxStaticBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSlider[] = {{&_swigt__p_wxSlider, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = {{&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSpinButton[] = {{&_swigt__p_wxSpinButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = {{&_swigt__p_wxButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = {{&_swigt__p_wxBitmapButton, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxContextHelpButton[] = {{&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDatePickerCtrl[] = {{&_swigt__p_wxDatePickerCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextCtrl[] = {{&_swigt__p_wxTextCtrl, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDuplexMode[] = { {&_swigt__p_wxDuplexMode, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashSplitEvent[] = { {&_swigt__p_wxDynamicSashSplitEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDynamicSashUnifyEvent[] = { {&_swigt__p_wxDynamicSashUnifyEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -11183,7 +11241,7 @@ static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigati static swig_cast_info _swigc__p_wxKeyEvent[] = {{&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTaskBarIconEvent[] = {{&_swigt__p_wxTaskBarIconEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewFrame[] = {{&_swigt__p_wxPyPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPreviewFrame[] = {{&_swigt__p_wxPreviewFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPanel[] = {{&_swigt__p_wxPyPanel, 0, 0, 0},{0, 0, 0, 0}}; @@ -11193,11 +11251,11 @@ static swig_cast_info _swigc__p_wxPreviewCanvas[] = {{&_swigt__p_wxPreviewCanvas static swig_cast_info _swigc__p_wxMDIChildFrame[] = {{&_swigt__p_wxMDIChildFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyWindow[] = {{&_swigt__p_wxPyWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSplashScreen[] = {{&_swigt__p_wxSplashScreen, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMessageDialog[] = {{&_swigt__p_wxMessageDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxProgressDialog[] = {{&_swigt__p_wxProgressDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFindReplaceDialog[] = {{&_swigt__p_wxFindReplaceDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxFileDialog[] = {{&_swigt__p_wxFileDialog, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxMultiChoiceDialog[] = {{&_swigt__p_wxMultiChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSingleChoiceDialog[] = {{&_swigt__p_wxSingleChoiceDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTextEntryDialog[] = {{&_swigt__p_wxTextEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPasswordEntryDialog[] = {{&_swigt__p_wxPasswordEntryDialog, 0, 0, 0},{0, 0, 0, 0}}; @@ -11207,12 +11265,12 @@ static swig_cast_info _swigc__p_wxMiniFrame[] = {{&_swigt__p_wxMiniFrame, 0, 0, static swig_cast_info _swigc__p_wxFrame[] = {{&_swigt__p_wxFrame, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStatusBar[] = {{&_swigt__p_wxStatusBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMDIParentFrame[] = {{&_swigt__p_wxMDIParentFrame, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashWindow[] = {{&_swigt__p_wxSashWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashLayoutWindow[] = {{&_swigt__p_wxSashLayoutWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPopupWindow[] = {{&_swigt__p_wxPopupWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPopupTransientWindow[] = {{&_swigt__p_wxPyPopupTransientWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTipWindow[] = {{&_swigt__p_wxTipWindow, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxSplashScreenWindow[] = {{&_swigt__p_wxSplashScreenWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyVScrolledWindow[] = {{&_swigt__p_wxPyVScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyScrolledWindow[] = {{&_swigt__p_wxPyScrolledWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTopLevelWindow[] = {{&_swigt__p_wxTopLevelWindow, 0, 0, 0},{0, 0, 0, 0}}; @@ -11226,7 +11284,7 @@ static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0 static swig_cast_info _swigc__p_wxPreviewControlBar[] = {{&_swigt__p_wxPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyPreviewControlBar[] = {{&_swigt__p_wxPyPreviewControlBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIcon[] = { {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageList[] = { {&_swigt__p_wxImageList, 0, 0, 0},{0, 0, 0, 0}}; @@ -11264,13 +11322,13 @@ static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintDialog[] = {{&_swigt__p_wxPrintDialog, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPageSetupDialog[] = {{&_swigt__p_wxPageSetupDialog, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPNGHandler[] = {{&_swigt__p_wxPNGHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxANIHandler[] = {{&_swigt__p_wxANIHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCURHandler[] = {{&_swigt__p_wxCURHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxICOHandler[] = {{&_swigt__p_wxICOHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -11278,7 +11336,7 @@ static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; @@ -11296,7 +11354,7 @@ static swig_cast_info _swigc__p_wxThinSplitterWindow[] = { {&_swigt__p_wxThinSp static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeListColumnInfo[] = { {&_swigt__p_wxTreeListColumnInfo, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -11505,10 +11563,14 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, _swigc__p_wxTopLevelWindow, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, _swigc__p_wxTreeListColumnInfo, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxWindow, diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp index b56371397b..9d0f57d603 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,7 +1581,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index 836893096a..7e1face0c2 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,7 +1581,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp index 1e2d2ab112..c2f0cb453b 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,7 +1581,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1662,7 +1663,7 @@ SWIG_Check_bool(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/contrib/stc/gtk/stc_wrap.cpp b/wxPython/contrib/stc/gtk/stc_wrap.cpp index 4250616efc..5b48641616 100644 --- a/wxPython/contrib/stc/gtk/stc_wrap.cpp +++ b/wxPython/contrib/stc/gtk/stc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1601,7 +1602,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1725,31 +1726,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } diff --git a/wxPython/contrib/stc/mac/stc_wrap.cpp b/wxPython/contrib/stc/mac/stc_wrap.cpp index 4250616efc..5b48641616 100644 --- a/wxPython/contrib/stc/mac/stc_wrap.cpp +++ b/wxPython/contrib/stc/mac/stc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1601,7 +1602,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1725,31 +1726,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp index 06925cf26c..d6a5739844 100644 --- a/wxPython/contrib/stc/msw/stc_wrap.cpp +++ b/wxPython/contrib/stc/msw/stc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1562,7 +1563,7 @@ static swig_module_info swig_module = {swig_types, 109, 0, 0, 0, 0}; static const wxString wxPySTCNameStr(wxSTCNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1601,7 +1602,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1725,31 +1726,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1797,7 +1797,7 @@ SWIG_AsCharPtr(PyObject *obj, char **val) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 342578f079..7d002af52e 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -2954,6 +2954,12 @@ def ToggleButton_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +BK_DEFAULT = _controls_.BK_DEFAULT +BK_TOP = _controls_.BK_TOP +BK_BOTTOM = _controls_.BK_BOTTOM +BK_LEFT = _controls_.BK_LEFT +BK_RIGHT = _controls_.BK_RIGHT +BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK class BookCtrlBase(_core.Control): """Proxy of C++ BookCtrlBase class""" def __init__(self): raise RuntimeError, "No constructor defined" @@ -3011,6 +3017,26 @@ class BookCtrlBase(_core.Control): """CalcSizeFromPage(self, Size sizePage) -> Size""" return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs) + def GetInternalBorder(*args, **kwargs): + """GetInternalBorder(self) -> unsigned int""" + return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs) + + def SetInternalBorder(*args, **kwargs): + """SetInternalBorder(self, unsigned int internalBorder)""" + return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs) + + def IsVertical(*args, **kwargs): + """IsVertical(self) -> bool""" + return _controls_.BookCtrlBase_IsVertical(*args, **kwargs) + + def SetShrinkMode(*args, **kwargs): + """SetShrinkMode(self, bool shrink)""" + return _controls_.BookCtrlBase_SetShrinkMode(*args, **kwargs) + + def GetShrinkMode(*args, **kwargs): + """GetShrinkMode(self) -> bool""" + return _controls_.BookCtrlBase_GetShrinkMode(*args, **kwargs) + def DeletePage(*args, **kwargs): """DeletePage(self, size_t n) -> bool""" return _controls_.BookCtrlBase_DeletePage(*args, **kwargs) @@ -3328,10 +3354,6 @@ class Listbook(BookCtrlBase): """ return _controls_.Listbook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Listbook_IsVertical(*args, **kwargs) - def GetListView(*args, **kwargs): """GetListView(self) -> ListView""" return _controls_.Listbook_GetListView(*args, **kwargs) @@ -3404,10 +3426,6 @@ class Choicebook(BookCtrlBase): """ return _controls_.Choicebook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Choicebook_IsVertical(*args, **kwargs) - def GetChoiceCtrl(*args, **kwargs): """GetChoiceCtrl(self) -> Choice""" return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs) @@ -3458,6 +3476,193 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C #--------------------------------------------------------------------------- +class Treebook(BookCtrlBase): + """Proxy of C++ Treebook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Treebook + """ + newobj = _controls_.new_Treebook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> bool + """ + return _controls_.Treebook_Create(*args, **kwargs) + + def InsertPage(*args, **kwargs): + """ + InsertPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertPage(*args, **kwargs) + + def InsertSubPage(*args, **kwargs): + """ + InsertSubPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertSubPage(*args, **kwargs) + + def AddPage(*args, **kwargs): + """AddPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddPage(*args, **kwargs) + + def AddSubPage(*args, **kwargs): + """AddSubPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddSubPage(*args, **kwargs) + + def DeletePage(*args, **kwargs): + """DeletePage(self, size_t pos) -> bool""" + return _controls_.Treebook_DeletePage(*args, **kwargs) + + def IsNodeExpanded(*args, **kwargs): + """IsNodeExpanded(self, size_t pos) -> bool""" + return _controls_.Treebook_IsNodeExpanded(*args, **kwargs) + + def ExpandNode(*args, **kwargs): + """ExpandNode(self, size_t pos, bool expand=True) -> bool""" + return _controls_.Treebook_ExpandNode(*args, **kwargs) + + def CollapseNode(*args, **kwargs): + """CollapseNode(self, size_t pos) -> bool""" + return _controls_.Treebook_CollapseNode(*args, **kwargs) + + def GetPageParent(*args, **kwargs): + """GetPageParent(self, size_t pos) -> int""" + return _controls_.Treebook_GetPageParent(*args, **kwargs) + + def GetTreeCtrl(*args, **kwargs): + """GetTreeCtrl(self) -> wxTreeCtrl""" + return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + + +class TreebookPtr(Treebook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Treebook +_controls_.Treebook_swigregister(TreebookPtr) + +def PreTreebook(*args, **kwargs): + """PreTreebook() -> Treebook""" + val = _controls_.new_PreTreebook(*args, **kwargs) + val.thisown = 1 + return val + +class TreebookEvent(BookCtrlBaseEvent): + """Proxy of C++ TreebookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> TreebookEvent + """ + newobj = _controls_.new_TreebookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class TreebookEventPtr(TreebookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = TreebookEvent +_controls_.TreebookEvent_swigregister(TreebookEventPtr) + +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING +wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED +wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED +EVT_TREEBOOK_PAGE_CHANGED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, 1 ) +EVT_TREEBOOK_PAGE_CHANGING= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, 1) +EVT_TREEBOOK_NODE_COLLAPSED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 1 ) +EVT_TREEBOOK_NODE_EXPANDED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, 1 ) + +#--------------------------------------------------------------------------- + +class Toolbook(BookCtrlBase): + """Proxy of C++ Toolbook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Toolbook + """ + newobj = _controls_.new_Toolbook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, String name=wxEmptyString) -> bool + """ + return _controls_.Toolbook_Create(*args, **kwargs) + + def GetToolBar(*args, **kwargs): + """GetToolBar(self) -> ToolBarBase""" + return _controls_.Toolbook_GetToolBar(*args, **kwargs) + + def Realize(*args, **kwargs): + """Realize(self)""" + return _controls_.Toolbook_Realize(*args, **kwargs) + + +class ToolbookPtr(Toolbook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Toolbook +_controls_.Toolbook_swigregister(ToolbookPtr) + +def PreToolbook(*args, **kwargs): + """PreToolbook() -> Toolbook""" + val = _controls_.new_PreToolbook(*args, **kwargs) + val.thisown = 1 + return val + +class ToolbookEvent(BookCtrlBaseEvent): + """Proxy of C++ ToolbookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> ToolbookEvent + """ + newobj = _controls_.new_ToolbookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class ToolbookEventPtr(ToolbookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = ToolbookEvent +_controls_.ToolbookEvent_swigregister(ToolbookEventPtr) + +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING +EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 1) +EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 1) + #--------------------------------------------------------------------------- TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON @@ -4093,6 +4298,12 @@ class ListItemAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_ListItemAttr): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTextColour(*args, **kwargs): """SetTextColour(self, Colour colText)""" return _controls_.ListItemAttr_SetTextColour(*args, **kwargs) @@ -4129,9 +4340,15 @@ class ListItemAttr(object): """GetFont(self) -> Font""" return _controls_.ListItemAttr_GetFont(*args, **kwargs) + def AssignFrom(*args, **kwargs): + """AssignFrom(self, ListItemAttr source)""" + return _controls_.ListItemAttr_AssignFrom(*args, **kwargs) + def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.ListItemAttr_Destroy(*args, **kwargs) + val = _controls_.ListItemAttr_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ListItemAttrPtr(ListItemAttr): @@ -5042,6 +5259,12 @@ class TreeItemData(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_TreeItemData): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetData(*args, **kwargs): """GetData(self) -> PyObject""" return _controls_.TreeItemData_GetData(*args, **kwargs) @@ -5060,7 +5283,9 @@ class TreeItemData(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.TreeItemData_Destroy(*args, **kwargs) + val = _controls_.TreeItemData_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class TreeItemDataPtr(TreeItemData): @@ -6167,7 +6392,9 @@ class HelpProvider(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.HelpProvider_Destroy(*args, **kwargs) + val = _controls_.HelpProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class HelpProviderPtr(HelpProvider): diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index f7b93297da..396cc9c476 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,20 +1581,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[146] #define SWIGTYPE_p_wxToolBarBase swig_types[147] #define SWIGTYPE_p_wxToolBarToolBase swig_types[148] -#define SWIGTYPE_p_wxTreeEvent swig_types[149] -#define SWIGTYPE_p_wxTreeItemId swig_types[150] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] -#define SWIGTYPE_p_wxValidator swig_types[152] -#define SWIGTYPE_p_wxVisualAttributes swig_types[153] -#define SWIGTYPE_p_wxWindow swig_types[154] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[155] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] -#define SWIGTYPE_p_wxXPMHandler swig_types[157] -#define SWIGTYPE_ptrdiff_t swig_types[158] -#define SWIGTYPE_std__ptrdiff_t swig_types[159] -#define SWIGTYPE_unsigned_int swig_types[160] -static swig_type_info *swig_types[162]; -static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[149] +#define SWIGTYPE_p_wxToolbookEvent swig_types[150] +#define SWIGTYPE_p_wxTreeCtrl swig_types[151] +#define SWIGTYPE_p_wxTreeEvent swig_types[152] +#define SWIGTYPE_p_wxTreeItemId swig_types[153] +#define SWIGTYPE_p_wxTreebook swig_types[154] +#define SWIGTYPE_p_wxTreebookEvent swig_types[155] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[156] +#define SWIGTYPE_p_wxValidator swig_types[157] +#define SWIGTYPE_p_wxVisualAttributes swig_types[158] +#define SWIGTYPE_p_wxWindow swig_types[159] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[160] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[161] +#define SWIGTYPE_p_wxXPMHandler swig_types[162] +#define SWIGTYPE_ptrdiff_t swig_types[163] +#define SWIGTYPE_std__ptrdiff_t swig_types[164] +#define SWIGTYPE_unsigned_int swig_types[165] +static swig_type_info *swig_types[167]; +static swig_module_info swig_module = {swig_types, 166, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1657,7 +1663,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1789,31 +1795,30 @@ SWIG_Check_bool(PyObject* obj) /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static const wxString wxPyGaugeNameStr(wxGaugeNameStr); @@ -1833,14 +1838,14 @@ static void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObje self->Insert(item, pos); } static PyObject *wxListBox_GetSelections(wxListBox *self){ - wxArrayInt lst; - self->GetSelections(lst); - PyObject *tup = PyTuple_New(lst.GetCount()); - for(size_t i=0; iGetSelections(lst); + PyObject *tup = PyTuple_New(lst.GetCount()); + for(size_t i=0; iGetWindowStyle() & wxLB_OWNERDRAW) @@ -1866,7 +1871,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1943,6 +1948,83 @@ SWIGINTERNINLINE PyObject* : PyInt_FromLong(static_cast(value)); } + +#if UINT_MAX < LONG_MAX +/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_long +/*@@*/ +#else +/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long +/*@@*/ +#endif + + +SWIGINTERNINLINE int + SWIG_CheckUnsignedLongInRange(unsigned long value, + unsigned long max_value, + const char *errmsg) +{ + if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %lu is greater than '%s' minimum %lu", + value, errmsg, max_value); + } + return 0; + } + return 1; + } + + +#if UINT_MAX != ULONG_MAX +SWIGINTERN int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + const char* errmsg = val ? "unsigned int" : (char*)0; + unsigned long v; + if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { + if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { + if (val) *val = static_cast(v); + return 1; + } + } else { + PyErr_Clear(); + } + if (val) { + SWIG_type_error(errmsg, obj); + } + return 0; +} +#else +SWIGINTERNINLINE unsigned int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); +} +#endif + + +SWIGINTERNINLINE unsigned int +SWIG_As_unsigned_SS_int(PyObject* obj) +{ + unsigned int v; + if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. + */ + memset((void*)&v, 0, sizeof(unsigned int)); + } + return v; +} + + +SWIGINTERNINLINE int +SWIG_Check_unsigned_SS_int(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); +} + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); static PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -2034,6 +2116,7 @@ public: // use the virtual version to avoid a confusing assert in the base class DEC_PYCALLBACK_INT_LONG_virtual(OnGetItemImage); + DEC_PYCALLBACK_INT_LONGLONG(OnGetItemColumnImage); PYPRIVATE; }; @@ -2043,7 +2126,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl); IMP_PYCALLBACK_STRING_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemText); IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); IMP_PYCALLBACK_INT_LONG_virtual(wxPyListCtrl, wxListCtrl, OnGetItemImage); - +IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage); + static wxListItem *wxPyListCtrl_GetColumn(wxPyListCtrl *self,int col){ wxListItem item; @@ -2145,83 +2229,6 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); - -#if UINT_MAX < LONG_MAX -/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_long -/*@@*/ -#else -/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long -/*@@*/ -#endif - - -SWIGINTERNINLINE int - SWIG_CheckUnsignedLongInRange(unsigned long value, - unsigned long max_value, - const char *errmsg) -{ - if (value > max_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %lu is greater than '%s' minimum %lu", - value, errmsg, max_value); - } - return 0; - } - return 1; - } - - -#if UINT_MAX != ULONG_MAX -SWIGINTERN int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - const char* errmsg = val ? "unsigned int" : (char*)0; - unsigned long v; - if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { - if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { - if (val) *val = static_cast(v); - return 1; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_type_error(errmsg, obj); - } - return 0; -} -#else -SWIGINTERNINLINE unsigned int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); -} -#endif - - -SWIGINTERNINLINE unsigned int -SWIG_As_unsigned_SS_int(PyObject* obj) -{ - unsigned int v; - if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(unsigned int)); - } - return v; -} - - -SWIGINTERNINLINE int -SWIG_Check_unsigned_SS_int(PyObject* obj) -{ - return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); -} - static wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item); if (data == NULL) { @@ -16599,7 +16606,7 @@ static PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -16750,6 +16757,152 @@ static PyObject *_wrap_BookCtrlBase_CalcSizeFromPage(PyObject *, PyObject *args, } +static PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetInternalBorder",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "internalBorder", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetInternalBorder",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInternalBorder(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_IsVertical",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->IsVertical(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "shrink", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetShrinkMode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShrinkMode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_GetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetShrinkMode",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->GetShrinkMode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; @@ -17955,21 +18108,781 @@ static PyObject *_wrap_Listbook_Create(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListbook *arg1 = (wxListbook *) 0 ; + wxListView *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListView *)(arg1)->GetListView(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxListbookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) 0 ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxChoicebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxChoice *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeleteAllPages(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxChoicebookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Treebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxBK_DEFAULT ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxTreebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Treebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreTreebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreTreebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) wxBK_DEFAULT ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Treebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->InsertPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertSubPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_AddPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; bool result; + bool temp3 = false ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxListbook const *)arg1)->IsVertical(); + result = (bool)(arg1)->AddPage(arg2,(wxString const &)*arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17977,52 +18890,302 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + { + if (temp3) + delete arg3; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } return NULL; } -static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Treebook_AddSubPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; - wxListView *result; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; + bool result; + bool temp3 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,(wxString const &)*arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp3) + delete arg3; + } + return resultobj; + fail: + { + if (temp3) + delete arg3; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_DeletePage",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeletePage(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_IsNodeExpanded(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_IsNodeExpanded",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreebook const *)arg1)->IsNodeExpanded(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_ExpandNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool arg3 = (bool) true ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "expand", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Treebook_ExpandNode",kwnames,&obj0,&obj1,&obj2)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_bool(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ExpandNode(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_CollapseNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_CollapseNode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CollapseNode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetPageParent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_GetPageParent",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxTreebook const *)arg1)->GetPageParent(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxTreeCtrl *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Treebook_GetTreeCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListView *)(arg1)->GetListView(); + result = (wxTreeCtrl *)((wxTreebook const *)arg1)->GetTreeCtrl(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreeCtrl, 0); return resultobj; fail: return NULL; } -static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { +static PyObject * Treebook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_TreebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxListbookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxTreebookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18031,7 +19194,7 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TreebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -18058,26 +19221,26 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + result = (wxTreebookEvent *)new wxTreebookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * TreebookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Toolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -18085,10 +19248,10 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxBK_DEFAULT ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; - wxChoicebook *result; + wxToolbook *result; wxPoint temp3 ; wxSize temp4 ; bool temp6 = false ; @@ -18102,7 +19265,7 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Toolbook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18135,14 +19298,13 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } } { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + result = (wxToolbook *)new wxToolbook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); { if (temp6) delete arg6; @@ -18157,32 +19319,31 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } -static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PreToolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *result; + wxToolbook *result; char *kwnames[] = { NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreToolbook",kwnames)) goto fail; { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(); + result = (wxToolbook *)new wxToolbook(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Create(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxToolbook *arg1 = (wxToolbook *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; @@ -18190,7 +19351,7 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; long arg6 = (long) 0 ; - wxString const &arg7_defvalue = wxPyEmptyString ; + wxString const &arg7_defvalue = wxEmptyString ; wxString *arg7 = (wxString *) &arg7_defvalue ; bool result; wxPoint temp4 ; @@ -18207,8 +19368,8 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Toolbook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; @@ -18265,102 +19426,73 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k } -static PyObject *_wrap_Choicebook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; + wxToolBarBase *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_GetToolBar",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxChoicebook const *)arg1)->IsVertical(); + result = (wxToolBarBase *)((wxToolbook const *)arg1)->GetToolBar(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - wxChoice *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = wxPyMake_wxObject(result, (bool)0); } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Realize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_Realize",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->DeleteAllPages(); + (arg1)->Realize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { +static PyObject * Toolbook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_ToolbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxChoicebookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxToolbookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18369,7 +19501,7 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ToolbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -18396,22 +19528,22 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + result = (wxToolbookEvent *)new wxToolbookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * ToolbookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -18491,7 +19623,7 @@ static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19410,7 +20542,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -19540,7 +20672,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -19596,7 +20728,7 @@ static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19634,7 +20766,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19666,7 +20798,7 @@ static PyObject *_wrap_ToolBarBase_AddControl(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19704,7 +20836,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19766,7 +20898,7 @@ static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19800,7 +20932,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19834,7 +20966,7 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20907,7 +22039,7 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20941,7 +22073,7 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21208,7 +22340,7 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21333,6 +22465,31 @@ static PyObject *_wrap_new_ListItemAttr(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_ListItemAttr(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ListItemAttr",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21606,6 +22763,41 @@ static PyObject *_wrap_ListItemAttr_GetFont(PyObject *, PyObject *args, PyObject } +static PyObject *_wrap_ListItemAttr_AssignFrom(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + wxListItemAttr *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "source", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItemAttr_AssignFrom",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (arg2 == NULL) { + SWIG_null_ref("wxListItemAttr"); + } + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AssignFrom((wxListItemAttr const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21654,7 +22846,7 @@ static PyObject *_wrap_new_ListItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -23362,7 +24554,7 @@ static PyObject *_wrap_ListEvent_m_item_get(PyObject *, PyObject *args, PyObject result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24134,7 +25326,7 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24352,7 +25544,7 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25265,7 +26457,7 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -27330,6 +28522,31 @@ static PyObject *_wrap_new_TreeItemData(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_TreeItemData(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TreeItemData",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TreeItemData_GetData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; @@ -28432,7 +29649,7 @@ static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -28460,7 +29677,7 @@ static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -28987,7 +30204,7 @@ static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *, PyObject *args, PyObject } if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30009,7 +31226,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *, PyObject *args, PyObject *kw } } if (obj4) { - SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(5)) SWIG_fail; } { @@ -30087,7 +31304,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -30175,7 +31392,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *, PyObject *args, PyObject } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30259,7 +31476,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *, PyObject *args, PyO } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30337,7 +31554,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -33578,7 +34795,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HelpProvider_Set",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33587,7 +34804,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 1); return resultobj; fail: return NULL; @@ -35357,6 +36574,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"BookCtrlBase_SetPageImage", (PyCFunction) _wrap_BookCtrlBase_SetPageImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_SetPageSize", (PyCFunction) _wrap_BookCtrlBase_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_CalcSizeFromPage", (PyCFunction) _wrap_BookCtrlBase_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_GetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_IsVertical", (PyCFunction) _wrap_BookCtrlBase_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_SetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_GetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction) _wrap_BookCtrlBase_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35388,7 +36610,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Listbook", (PyCFunction) _wrap_new_Listbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreListbook", (PyCFunction) _wrap_new_PreListbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_Create", (PyCFunction) _wrap_Listbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Listbook_IsVertical", (PyCFunction) _wrap_Listbook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_GetListView", (PyCFunction) _wrap_Listbook_GetListView, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_swigregister", Listbook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListbookEvent", (PyCFunction) _wrap_new_ListbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35396,12 +36617,35 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Choicebook", (PyCFunction) _wrap_new_Choicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreChoicebook", (PyCFunction) _wrap_new_PreChoicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_Create", (PyCFunction) _wrap_Choicebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Choicebook_IsVertical", (PyCFunction) _wrap_Choicebook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_GetChoiceCtrl", (PyCFunction) _wrap_Choicebook_GetChoiceCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_DeleteAllPages", (PyCFunction) _wrap_Choicebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_swigregister", Choicebook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ChoicebookEvent", (PyCFunction) _wrap_new_ChoicebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ChoicebookEvent_swigregister", ChoicebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Treebook", (PyCFunction) _wrap_new_Treebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreTreebook", (PyCFunction) _wrap_new_PreTreebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_Create", (PyCFunction) _wrap_Treebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertPage", (PyCFunction) _wrap_Treebook_InsertPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertSubPage", (PyCFunction) _wrap_Treebook_InsertSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddPage", (PyCFunction) _wrap_Treebook_AddPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddSubPage", (PyCFunction) _wrap_Treebook_AddSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_DeletePage", (PyCFunction) _wrap_Treebook_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_IsNodeExpanded", (PyCFunction) _wrap_Treebook_IsNodeExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_ExpandNode", (PyCFunction) _wrap_Treebook_ExpandNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_CollapseNode", (PyCFunction) _wrap_Treebook_CollapseNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetPageParent", (PyCFunction) _wrap_Treebook_GetPageParent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetTreeCtrl", (PyCFunction) _wrap_Treebook_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_swigregister", Treebook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_TreebookEvent", (PyCFunction) _wrap_new_TreebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreebookEvent_swigregister", TreebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Toolbook", (PyCFunction) _wrap_new_Toolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreToolbook", (PyCFunction) _wrap_new_PreToolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Create", (PyCFunction) _wrap_Toolbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_GetToolBar", (PyCFunction) _wrap_Toolbook_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Realize", (PyCFunction) _wrap_Toolbook_Realize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_swigregister", Toolbook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_ToolbookEvent", (PyCFunction) _wrap_new_ToolbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ToolbookEvent_swigregister", ToolbookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"ToolBarToolBase_GetId", (PyCFunction) _wrap_ToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetControl", (PyCFunction) _wrap_ToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetToolBar", (PyCFunction) _wrap_ToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35484,6 +36728,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItemAttr", (PyCFunction) _wrap_new_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ListItemAttr", (PyCFunction) _wrap_delete_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetTextColour", (PyCFunction) _wrap_ListItemAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetFont", (PyCFunction) _wrap_ListItemAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35493,6 +36738,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListItemAttr_GetTextColour", (PyCFunction) _wrap_ListItemAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetFont", (PyCFunction) _wrap_ListItemAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListItemAttr_AssignFrom", (PyCFunction) _wrap_ListItemAttr_AssignFrom, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_Destroy", (PyCFunction) _wrap_ListItemAttr_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_swigregister", ListItemAttr_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItem", (PyCFunction) _wrap_new_ListItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35668,6 +36914,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemId_m_pItem_get", (PyCFunction) _wrap_TreeItemId_m_pItem_get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemId_swigregister", TreeItemId_swigregister, METH_VARARGS, NULL}, { (char *)"new_TreeItemData", (PyCFunction) _wrap_new_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TreeItemData", (PyCFunction) _wrap_delete_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetData", (PyCFunction) _wrap_TreeItemData_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_SetData", (PyCFunction) _wrap_TreeItemData_SetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetId", (PyCFunction) _wrap_TreeItemData_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35931,6 +37178,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -36048,8 +37301,8 @@ static void *_p_wxToggleButtonTo_p_wxControl(void *x) { static void *_p_wxRadioButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxRadioButton *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -36063,6 +37316,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxGenericDirCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxGenericDirCtrl *) x)); } @@ -36123,8 +37379,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -36135,6 +37391,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -36168,12 +37427,24 @@ static void *_p_wxListbookEventTo_p_wxNotifyEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxNotifyEvent(void *x) { return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxChoicebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxChoicebook *) x)); } static void *_p_wxListbookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxListbook *) x)); } +static void *_p_wxToolbookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxToolbook *) x)); +} +static void *_p_wxTreebookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -36201,18 +37472,21 @@ static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) ((wxWindow *) x)); } static void *_p_wxControlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxComboBoxTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxComboBox *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxPyListCtrlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxPyListCtrl *) x)); } @@ -36285,6 +37559,9 @@ static void *_p_wxStaticBoxTo_p_wxEvtHandler(void *x) { static void *_p_wxSliderTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSpinButton *) x)); } @@ -36321,6 +37598,9 @@ static void *_p_wxSimpleHelpProviderTo_p_wxHelpProvider(void *x) { static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxGBSizerItemTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizerItem *) ((wxGBSizerItem *) x)); } @@ -36429,6 +37709,9 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { static void *_p_wxPySizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxPySizer *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -36606,6 +37889,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -36702,21 +37991,24 @@ static void *_p_wxToggleButtonTo_p_wxWindow(void *x) { static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } static void *_p_wxToolBarBaseTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxToolBarBase *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } static void *_p_wxComboBoxTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxComboBox *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyControl *) x)); } @@ -36780,6 +38072,9 @@ static void *_p_wxStaticBoxTo_p_wxWindow(void *x) { static void *_p_wxSliderTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSpinButton *) x)); } @@ -36807,6 +38102,12 @@ static void *_p_wxListbookEventTo_p_wxBookCtrlBaseEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent(void *x) { return (void *)((wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -36834,6 +38135,12 @@ static void *_p_wxNotebookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -36934,9 +38241,9 @@ static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMoveEvent = {"_p_wxMoveEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPaintEvent = {"_p_wxPaintEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxNcPaintEvent = {"_p_wxNcPaintEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0}; @@ -36984,8 +38291,6 @@ static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0 static swig_type_info _swigt__p_wxFSFile = {"_p_wxFSFile", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPySizer = {"_p_wxPySizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; @@ -36997,6 +38302,8 @@ static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImage = {"_p_wxImage", 0, 0, 0, 0}; @@ -37029,8 +38336,13 @@ static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", "wxToggle static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", "wxToolBar *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", "wxToolBarBase *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", "wxToolBarToolBase *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", "wxToolbook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", "wxToolbookEvent *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreeCtrl = {"_p_wxTreeCtrl", "wxTreeCtrl *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeEvent = {"_p_wxTreeEvent", "wxTreeEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeItemId = {"_p_wxTreeItemId", "wxTreeItemId *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", "wxTreebook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", "wxTreebookEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxValidator = {"_p_wxValidator", "wxValidator *", 0, 0, 0}; static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, 0}; static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, 0}; @@ -37188,8 +38500,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, + &_swigt__p_wxTreeCtrl, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxVisualAttributes, @@ -37215,8 +38532,8 @@ static swig_cast_info _swigc__p_wxArrayInt[] = { {&_swigt__p_wxArrayInt, 0, 0, static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = { {&_swigt__p_wxBitmapButton, 0, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxBitmapButton, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = { {&_swigt__p_wxButton, 0, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxButton, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxButton, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckBox[] = { {&_swigt__p_wxCheckBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckListBox[] = { {&_swigt__p_wxCheckListBox, 0, 0, 0},{0, 0, 0, 0}}; @@ -37233,10 +38550,10 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelp[] = { {&_swigt__p_wxContextHelp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelpButton[] = { {&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = { {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxControlWithItems, 0, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControlWithItems, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCursor[] = { {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDC[] = { {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -37259,21 +38576,21 @@ static swig_cast_info _swigc__p_wxSizeEvent[] = {{&_swigt__p_wxSizeEvent, 0, 0, static swig_cast_info _swigc__p_wxMoveEvent[] = {{&_swigt__p_wxMoveEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaintEvent[] = {{&_swigt__p_wxPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNcPaintEvent[] = {{&_swigt__p_wxNcPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuBar[] = {{&_swigt__p_wxMenuBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = {{&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGauge[] = { {&_swigt__p_wxGauge, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = { {&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37295,7 +38612,7 @@ static swig_cast_info _swigc__p_wxMemoryDC[] = { {&_swigt__p_wxMemoryDC, 0, 0, static swig_cast_info _swigc__p_wxMouseEvent[] = { {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebook[] = { {&_swigt__p_wxNotebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebookEvent[] = { {&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}}; @@ -37309,8 +38626,6 @@ static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer static swig_cast_info _swigc__p_wxFSFile[] = {{&_swigt__p_wxFSFile, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPySizer[] = {{&_swigt__p_wxPySizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -37322,11 +38637,13 @@ static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFileSystem[] = {{&_swigt__p_wxFileSystem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = { {&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37355,11 +38672,16 @@ static swig_cast_info _swigc__p_wxToggleButton[] = { {&_swigt__p_wxToggleButton static swig_cast_info _swigc__p_wxToolBar[] = { {&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = { {&_swigt__p_wxToolBarBase, 0, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxToolBarBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = { {&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = { {&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = { {&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreeCtrl[] = { {&_swigt__p_wxTreeCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeEvent[] = { {&_swigt__p_wxTreeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = { {&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = { {&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxVisualAttributes[] = { {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -37514,8 +38836,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, + _swigc__p_wxTreeCtrl, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxVisualAttributes, @@ -38285,6 +39612,24 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NotebookNameStr",_wrap_NotebookNameStr_get, _wrap_NotebookNameStr_set); + { + PyDict_SetItemString(d,"BK_DEFAULT", SWIG_From_int(static_cast(wxBK_DEFAULT))); + } + { + PyDict_SetItemString(d,"BK_TOP", SWIG_From_int(static_cast(wxBK_TOP))); + } + { + PyDict_SetItemString(d,"BK_BOTTOM", SWIG_From_int(static_cast(wxBK_BOTTOM))); + } + { + PyDict_SetItemString(d,"BK_LEFT", SWIG_From_int(static_cast(wxBK_LEFT))); + } + { + PyDict_SetItemString(d,"BK_RIGHT", SWIG_From_int(static_cast(wxBK_RIGHT))); + } + { + PyDict_SetItemString(d,"BK_ALIGN_MASK", SWIG_From_int(static_cast(wxBK_ALIGN_MASK))); + } { PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_From_int(static_cast(wxNB_FIXEDWIDTH))); } @@ -38360,6 +39705,12 @@ SWIGEXPORT void SWIG_init(void) { } PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING)); { PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_From_int(static_cast(wxTOOL_STYLE_BUTTON))); } diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index f7ad0825f6..39847bbff4 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -708,7 +708,9 @@ class Object(object): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Object_Destroy(*args, **kwargs) + val = _core_.Object_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ObjectPtr(Object): @@ -2415,7 +2417,9 @@ class Image(Object): Destroys the image data. """ - return _core_.Image_Destroy(*args, **kwargs) + val = _core_.Image_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def Scale(*args, **kwargs): """ @@ -3596,7 +3600,9 @@ class EvtHandler(Object): def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self, bool incref=True)""" - return _core_.EvtHandler__setOORInfo(*args, **kwargs) + val = _core_.EvtHandler__setOORInfo(*args, **kwargs) + args[0].thisown = 0 + return val def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): """ @@ -8109,7 +8115,9 @@ class Window(EvtHandler): Returns True if the window has either been successfully deleted, or it has been added to the list of windows pending real deletion. """ - return _core_.Window_Destroy(*args, **kwargs) + val = _core_.Window_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyChildren(*args, **kwargs): """ @@ -10157,6 +10165,9 @@ class Window(EvtHandler): if hasattr(self, '_setCallbackInfo'): self._setCallbackInfo(self, self.__class__) + def SendSizeEvent(self): + self.GetEventhandler().ProcessEvent(wx.SizeEvent((-1,-1))) + class WindowPtr(Window): def __init__(self, this): @@ -10513,7 +10524,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_Destroy(*args, **kwargs) + val = _core_.Menu_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyId(*args, **kwargs): """ @@ -10521,7 +10534,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyId(*args, **kwargs) + val = _core_.Menu_DestroyId(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyItem(*args, **kwargs): """ @@ -10529,7 +10544,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyItem(*args, **kwargs) + val = _core_.Menu_DestroyItem(*args, **kwargs) + args[0].thisown = 0 + return val def GetMenuItemCount(*args, **kwargs): """GetMenuItemCount(self) -> size_t""" @@ -11336,6 +11353,12 @@ class SizerItem(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_SizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def DeleteWindows(*args, **kwargs): """ DeleteWindows(self) @@ -11681,6 +11704,12 @@ class Sizer(Object): def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __del__(self, destroy=_core_.delete_Sizer): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self)""" return _core_.Sizer__setOORInfo(*args, **kwargs) @@ -12604,6 +12633,12 @@ class GBPosition(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBPosition): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRow(*args, **kwargs): """GetRow(self) -> int""" return _core_.GBPosition_GetRow(*args, **kwargs) @@ -12683,6 +12718,12 @@ class GBSpan(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSpan): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRowspan(*args, **kwargs): """GetRowspan(self) -> int""" return _core_.GBSpan_GetRowspan(*args, **kwargs) @@ -12763,6 +12804,12 @@ class GBSizerItem(SizerItem): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetPos(*args, **kwargs): """ GetPos(self) -> GBPosition diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index cd0aae0eff..37b874b65e 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1673,8 +1674,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyObject* robj = NULL; swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr")); +#if SWIG_VERSION < 0x010328 #ifdef SWIG_COBJECT_TYPES robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name); #else @@ -1684,7 +1686,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyString_FromString(result) : 0; } #endif - +#else // SWIG_VERSION >= 1.3.28 + robj = PySwigObject_New(ptr, swigType, 0); +#endif return robj; } @@ -1845,7 +1849,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1918,7 +1922,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2032,31 +2036,30 @@ static PyObject *wxRect_Get(wxRect *self){ } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){ @@ -2343,7 +2346,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -3152,6 +3155,8 @@ static wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=0,in wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -3172,6 +3177,8 @@ static wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int p wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Insert method if a valid item type was found @@ -3192,6 +3199,8 @@ static wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion= wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Prepend method if a valid item type was found @@ -3376,6 +3385,8 @@ static wxGBSizerItem *wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxG wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -8161,7 +8172,7 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -8535,7 +8546,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -8902,7 +8913,7 @@ static PyObject *_wrap_new_FileSystem(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -9044,7 +9055,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -9393,7 +9404,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9520,7 +9531,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9918,7 +9929,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -15851,7 +15862,7 @@ static PyObject *_wrap_Event_GetEventObject(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17188,7 +17199,7 @@ static PyObject *_wrap_new_MouseEvent(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -20584,7 +20595,7 @@ static PyObject *_wrap_EraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20657,7 +20668,7 @@ static PyObject *_wrap_FocusEvent_GetWindow(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20749,7 +20760,7 @@ static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21002,7 +21013,7 @@ static PyObject *_wrap_MenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22092,7 +22103,7 @@ static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22215,7 +22226,7 @@ static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22576,7 +22587,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22668,7 +22679,7 @@ static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22731,7 +22742,7 @@ static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24113,7 +24124,7 @@ static PyObject *_wrap_PyApp_GetTopWindow(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -29398,7 +29409,7 @@ static PyObject *_wrap_Window_GetValidator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -31004,7 +31015,7 @@ static PyObject *_wrap_Window_SetCaret(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCaret",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32413,7 +32424,7 @@ static PyObject *_wrap_Window_SetToolTip(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTip",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32449,7 +32460,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32700,7 +32711,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32737,7 +32748,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32779,7 +32790,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32836,7 +32847,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33531,7 +33542,7 @@ static PyObject *_wrap_Menu_Append(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33575,7 +33586,7 @@ static PyObject *_wrap_Menu_AppendSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33628,7 +33639,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33697,7 +33708,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33770,7 +33781,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33818,7 +33829,7 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33881,7 +33892,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33948,7 +33959,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -33998,7 +34009,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34057,7 +34068,7 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34132,7 +34143,7 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34211,7 +34222,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34259,7 +34270,7 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34320,7 +34331,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34364,7 +34375,7 @@ static PyObject *_wrap_Menu_PrependSeparator(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34417,7 +34428,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34486,7 +34497,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34559,7 +34570,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34609,7 +34620,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34641,7 +34652,7 @@ static PyObject *_wrap_Menu_RemoveItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34930,7 +34941,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34964,7 +34975,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -35550,7 +35561,7 @@ static PyObject *_wrap_Menu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36229,7 +36240,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36613,7 +36624,7 @@ static PyObject *_wrap_MenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36827,7 +36838,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -39253,6 +39264,31 @@ static PyObject *_wrap_new_SizerItem(PyObject *, PyObject *args, PyObject *kwarg } +static PyObject *_wrap_delete_SizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_SizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_SizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -39377,7 +39413,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = static_cast(SWIG_As_int(obj1)); @@ -39521,8 +39557,10 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *, PyObject *args, PyObject *k static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxPoint arg2 ; - wxSize arg3 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -39534,28 +39572,16 @@ static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObje SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxPoint * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxPoint"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { - wxSize * argp; - SWIG_Python_ConvertPtr(obj2, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(3)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxSize"); - } - if (SWIG_arg_fail(3)) SWIG_fail; - arg3 = *argp; + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDimension(arg2,arg3); + (arg1)->SetDimension((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -40160,7 +40186,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -40181,7 +40207,7 @@ static PyObject *_wrap_SizerItem_SetSizer(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40408,6 +40434,31 @@ static PyObject * SizerItem_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static PyObject *_wrap_delete_Sizer(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Sizer",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Sizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizer *arg1 = (wxSizer *) 0 ; @@ -40756,7 +40807,7 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40792,7 +40843,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kw arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40822,7 +40873,7 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_PrependItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -41620,7 +41671,7 @@ static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42506,7 +42557,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetAffirmativeButton(PyObject *, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42534,7 +42585,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetApplyButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42562,7 +42613,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetNegativeButton(PyObject *, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42590,7 +42641,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetCancelButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42618,7 +42669,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetHelpButton(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42671,6 +42722,31 @@ static PyObject *_wrap_new_GBPosition(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_delete_GBPosition(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBPosition *arg1 = (wxGBPosition *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBPosition",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBPosition *arg1 = (wxGBPosition *) 0 ; @@ -42971,6 +43047,31 @@ static PyObject *_wrap_new_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSpan *arg1 = (wxGBSpan *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSpan",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBSpan *arg1 = (wxGBSpan *) 0 ; @@ -43269,6 +43370,31 @@ static PyObject *_wrap_new_GBSizerItem(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_GBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_GBSizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -43348,7 +43474,7 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; @@ -43869,7 +43995,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -47313,6 +47439,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerItem", (PyCFunction) _wrap_delete_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47350,6 +47477,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetUserData", (PyCFunction) _wrap_SizerItem_SetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS, NULL}, + { (char *)"delete_Sizer", (PyCFunction) _wrap_delete_Sizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47425,6 +47553,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StdDialogButtonSizer_GetHelpButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetHelpButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StdDialogButtonSizer_swigregister", StdDialogButtonSizer_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBPosition", (PyCFunction) _wrap_delete_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47435,6 +47564,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSpan", (PyCFunction) _wrap_delete_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47445,6 +47575,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSizerItem", (PyCFunction) _wrap_delete_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index d9d9080e8d..e727da03fe 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -4207,10 +4207,7 @@ class BufferedDC(MemoryDC): def __init__(self, *args): """ __init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC - __init__(self, DC dc, Bitmap buffer=NullBitmap) -> BufferedDC - __init__(self, DC dc) -> BufferedDC __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC - __init__(self, DC dc, Size area) -> BufferedDC Constructs a buffered DC. """ diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 7d8af2b8af..9e45cbbc5a 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1624,7 +1625,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1711,7 +1712,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1863,31 +1864,30 @@ SWIG_Check_int(PyObject* obj) /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPen_GetDashes(wxPen *self){ @@ -2192,7 +2192,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -17483,27 +17483,32 @@ static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; - wxBitmap *arg2 = 0 ; - int arg3 ; + wxBitmap const &arg2_defvalue = wxNullBitmap ; + wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg2 == NULL) { - SWIG_null_ref("wxBitmap"); + if (obj1) { + { + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (arg2 == NULL) { + SWIG_null_ref("wxBitmap"); + } + if (SWIG_arg_fail(2)) SWIG_fail; } - if (SWIG_arg_fail(2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } } { if (!wxPyCheckForApp()) SWIG_fail; @@ -17521,84 +17526,28 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxBitmap *arg2 = 0 ; - wxBufferedDC *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg2 == NULL) { - SWIG_null_ref("wxBitmap"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_BufferedDC__SWIG_2(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxBufferedDC *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:new_BufferedDC",&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; - int arg3 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } } { if (!wxPyCheckForApp()) SWIG_fail; @@ -17615,37 +17564,6 @@ static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) { } -static PyObject *_wrap_new_BufferedDC__SWIG_4(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxSize *arg2 = 0 ; - wxBufferedDC *result; - wxSize temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; PyObject *argv[4]; @@ -17655,7 +17573,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 1) { + if ((argc >= 1) && (argc <= 3)) { int _v; { void *ptr; @@ -17667,21 +17585,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_2(self,args); - } - } - if (argc == 2) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 1) { + return _wrap_new_BufferedDC__SWIG_0(self,args); } - } - if (_v) { { void *ptr = 0; if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { @@ -17692,54 +17598,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); - } - } - } - if (argc == 2) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); - } - if (_v) { - return _wrap_new_BufferedDC__SWIG_4(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); - } - if (_v) { + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } _v = SWIG_Check_int(argv[2]); if (_v) { - return _wrap_new_BufferedDC__SWIG_3(self,args); + return _wrap_new_BufferedDC__SWIG_0(self,args); } } } } - if (argc == 3) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17752,18 +17621,15 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } if (_v) { { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } _v = SWIG_Check_int(argv[2]); if (_v) { - return _wrap_new_BufferedDC__SWIG_0(self,args); + return _wrap_new_BufferedDC__SWIG_1(self,args); } } } @@ -18531,7 +18397,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 98b13a6f47..a941af15d2 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -778,6 +778,12 @@ class ToolTip(_core.Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_ToolTip): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTip(*args, **kwargs): """SetTip(self, String tip)""" return _misc_.ToolTip_SetTip(*args, **kwargs) @@ -826,13 +832,21 @@ class Caret(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Caret): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def Destroy(*args, **kwargs): """ Destroy(self) Deletes the C++ object this Python object is a proxy for. """ - return _misc_.Caret_Destroy(*args, **kwargs) + val = _misc_.Caret_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -1310,7 +1324,6 @@ class TimerRunner(object): """ __init__(self, wxTimer timer) -> TimerRunner __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner - __init__(self, wxTimer timer, int milli) -> TimerRunner """ newobj = _misc_.new_TimerRunner(*args) self.this = newobj.this @@ -1367,6 +1380,12 @@ class Log(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Log): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def IsEnabled(*args, **kwargs): """IsEnabled() -> bool""" return _misc_.Log_IsEnabled(*args, **kwargs) @@ -1488,7 +1507,9 @@ class Log(object): TimeStamp = staticmethod(TimeStamp) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.Log_Destroy(*args, **kwargs) + val = _misc_.Log_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class LogPtr(Log): @@ -2691,6 +2712,12 @@ class ArtProvider(object): del newobj.thisown self._setCallbackInfo(self, ArtProvider) + def __del__(self, destroy=_misc_.delete_ArtProvider): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs) @@ -2720,7 +2747,9 @@ class ArtProvider(object): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val RemoveProvider = staticmethod(RemoveProvider) def GetBitmap(*args, **kwargs): @@ -2755,7 +2784,9 @@ class ArtProvider(object): GetSizeHint = staticmethod(GetSizeHint) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.ArtProvider_Destroy(*args, **kwargs) + val = _misc_.ArtProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ArtProviderPtr(ArtProvider): @@ -2844,7 +2875,9 @@ def ArtProvider_RemoveProvider(*args, **kwargs): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val def ArtProvider_GetBitmap(*args, **kwargs): """ @@ -4840,7 +4873,6 @@ class DataObject(object): GetDataHere(self, DataFormat format) -> String Get the data bytes in the specified format, returns None on failure. - """ return _misc_.DataObject_GetDataHere(*args, **kwargs) diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 8e4aaefec2..d7ccca13de 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1665,7 +1666,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1801,31 +1802,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1838,7 +1838,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2140,7 +2140,7 @@ static wxString wxLog_TimeStamp(){ return msg; } static void wxLog_Destroy(wxLog *self){ delete self; } -// Make somce wrappers that double any % signs so they are 'escaped' +// Make some wrappers that double any % signs so they are 'escaped' void wxPyLogFatalError(const wxString& msg) { wxString m(msg); @@ -2661,7 +2661,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -7014,9 +7014,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolTip, 1); { if (temp1) delete arg1; @@ -7031,6 +7029,31 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxToolTip *arg1 = (wxToolTip *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ToolTip",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ToolTip_SetTip(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxToolTip *arg1 = (wxToolTip *) 0 ; @@ -7227,6 +7250,31 @@ static PyObject *_wrap_new_Caret(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Caret(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxCaret *arg1 = (wxCaret *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Caret",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Caret_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxCaret *arg1 = (wxCaret *) 0 ; @@ -9468,13 +9516,13 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxTimer *arg1 = 0 ; int arg2 ; - bool arg3 ; + bool arg3 = (bool) false ; wxTimerRunner *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; { SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTimer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; @@ -9487,50 +9535,16 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *, PyObject *args) { arg2 = static_cast(SWIG_As_int(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_bool(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimerRunner, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_TimerRunner__SWIG_2(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxTimer *arg1 = 0 ; - int arg2 ; - wxTimerRunner *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_TimerRunner",&obj0,&obj1)) goto fail; - { - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTimer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (arg1 == NULL) { - SWIG_null_ref("wxTimer"); + if (obj2) { + { + arg3 = static_cast(SWIG_As_bool(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; } - if (SWIG_arg_fail(1)) SWIG_fail; - } - { - arg2 = static_cast(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2); + result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9566,25 +9580,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { return _wrap_new_TimerRunner__SWIG_0(self,args); } } - if (argc == 2) { - int _v; - { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxTimer, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } - } - if (_v) { - _v = SWIG_Check_int(argv[1]); - if (_v) { - return _wrap_new_TimerRunner__SWIG_2(self,args); - } - } - } - if (argc == 3) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr = 0; @@ -9598,6 +9594,9 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { if (_v) { _v = SWIG_Check_int(argv[1]); if (_v) { + if (argc <= 2) { + return _wrap_new_TimerRunner__SWIG_1(self,args); + } _v = SWIG_Check_bool(argv[2]); if (_v) { return _wrap_new_TimerRunner__SWIG_1(self,args); @@ -9704,6 +9703,31 @@ static PyObject *_wrap_new_Log(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Log(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxLog *arg1 = (wxLog *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Log",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Log_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; bool result; @@ -9875,7 +9899,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetActiveTarget",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9884,7 +9908,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 1); return resultobj; fail: return NULL; @@ -10568,7 +10592,7 @@ static PyObject *_wrap_LogWindow_GetFrame(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12499,7 +12523,11 @@ static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) { { PyObject* o; o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj, o); + + + } return resultobj; fail: @@ -17493,6 +17521,31 @@ static PyObject *_wrap_new_ArtProvider(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_ArtProvider(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArtProvider",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; @@ -17533,7 +17586,7 @@ static PyObject *_wrap_ArtProvider_PushProvider(PyObject *, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32735,6 +32788,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MutexGuiLocker_swigregister", MutexGuiLocker_swigregister, METH_VARARGS, NULL}, { (char *)"Thread_IsMain", (PyCFunction) _wrap_Thread_IsMain, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_ToolTip", (PyCFunction) _wrap_new_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ToolTip", (PyCFunction) _wrap_delete_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_SetTip", (PyCFunction) _wrap_ToolTip_SetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetTip", (PyCFunction) _wrap_ToolTip_GetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetWindow", (PyCFunction) _wrap_ToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32742,6 +32796,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolTip_SetDelay", (PyCFunction) _wrap_ToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_swigregister", ToolTip_swigregister, METH_VARARGS, NULL}, { (char *)"new_Caret", (PyCFunction) _wrap_new_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_Destroy", (PyCFunction) _wrap_Caret_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32825,6 +32880,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TimerRunner_Start", (PyCFunction) _wrap_TimerRunner_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TimerRunner_swigregister", TimerRunner_swigregister, METH_VARARGS, NULL}, { (char *)"new_Log", (PyCFunction) _wrap_new_Log, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Log", (PyCFunction) _wrap_delete_Log, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_IsEnabled", (PyCFunction) _wrap_Log_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_EnableLogging", (PyCFunction) _wrap_Log_EnableLogging, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_OnLog", (PyCFunction) _wrap_Log_OnLog, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33042,6 +33098,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS, NULL}, { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ArtProvider", (PyCFunction) _wrap_delete_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 670e93ce21..ff76c58591 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -691,9 +691,6 @@ class Dialog(TopLevelWindow): return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) - def SendSizeEvent(self): - self.ProcessEvent(wx.SizeEvent((-1,-1))) - class DialogPtr(Dialog): def __init__(self, this): @@ -2190,6 +2187,12 @@ class TaskBarIcon(_core.EvtHandler): del newobj.thisown self._setCallbackInfo(self, TaskBarIcon, 0) + def __del__(self, destroy=_windows_.delete_TaskBarIcon): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) @@ -2200,7 +2203,9 @@ class TaskBarIcon(_core.EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _windows_.TaskBarIcon_Destroy(*args, **kwargs) + val = _windows_.TaskBarIcon_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -4714,7 +4719,6 @@ class PrintPreview(_core.Object): def __init__(self, *args): """ __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview - __init__(self, Printout printout, Printout printoutForPrinting) -> PrintPreview __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview """ newobj = _windows_.new_PrintPreview(*args) @@ -4825,7 +4829,6 @@ class PyPrintPreview(PrintPreview): def __init__(self, *args): """ __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview - __init__(self, Printout printout, Printout printoutForPrinting) -> PyPrintPreview __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview """ newobj = _windows_.new_PyPrintPreview(*args) diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index 60f81c0e68..5811ae4f63 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1652,7 +1653,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1781,31 +1782,30 @@ SWIG_Check_bool(PyObject* obj) /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1817,7 +1817,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1982,7 +1982,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -5212,7 +5212,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp5) @@ -5248,7 +5248,7 @@ static PyObject *_wrap_Frame_GetStatusBar(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5561,7 +5561,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -5597,7 +5597,7 @@ static PyObject *_wrap_Frame_GetToolBar(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6071,7 +6071,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -6129,7 +6129,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -13136,6 +13136,31 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; @@ -17492,7 +17517,7 @@ static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17520,7 +17545,7 @@ static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24031,7 +24056,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -24285,7 +24310,7 @@ static PyObject *_wrap_Printer_PrintDialog(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24407,7 +24432,7 @@ static PyObject *_wrap_new_Printout(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp1) @@ -24506,7 +24531,7 @@ static PyObject *_wrap_Printout_GetDC(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25720,19 +25745,21 @@ static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintDialogData *arg3 = (wxPrintDialogData *) 0 ; + wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ; wxPrintPreview *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25749,34 +25776,6 @@ static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_PrintPreview__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintPreview *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_PrintPreview",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPrintPreview *)new wxPrintPreview(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintPreview, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PrintPreview__SWIG_2(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; @@ -25817,7 +25816,7 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -25839,32 +25838,9 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PrintPreview__SWIG_1(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 2) { + return _wrap_new_PrintPreview__SWIG_0(self,args); } - } - if (_v) { { void *ptr; if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) { @@ -25912,7 +25888,7 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PrintPreview__SWIG_2(self,args); + return _wrap_new_PrintPreview__SWIG_1(self,args); } } } @@ -26034,7 +26010,7 @@ static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -26062,7 +26038,7 @@ static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -26602,19 +26578,21 @@ static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintDialogData *arg3 = (wxPrintDialogData *) 0 ; + wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ; wxPyPrintPreview *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26631,34 +26609,6 @@ static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_PyPrintPreview__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPyPrintPreview *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_PyPrintPreview",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPyPrintPreview *)new wxPyPrintPreview(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPrintPreview, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PyPrintPreview__SWIG_2(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; @@ -26699,7 +26649,7 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -26721,32 +26671,9 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PyPrintPreview__SWIG_1(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 2) { + return _wrap_new_PyPrintPreview__SWIG_0(self,args); } - } - if (_v) { { void *ptr; if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) { @@ -26794,7 +26721,7 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PyPrintPreview__SWIG_2(self,args); + return _wrap_new_PyPrintPreview__SWIG_1(self,args); } } } @@ -27845,6 +27772,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL}, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/calendar_wrap.cpp b/wxPython/src/gtk/calendar_wrap.cpp index fb358f4840..dd618991fb 100644 --- a/wxPython/src/gtk/calendar_wrap.cpp +++ b/wxPython/src/gtk/calendar_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1596,7 +1597,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1726,7 +1727,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py index c64631e582..31c0d4da8e 100644 --- a/wxPython/src/gtk/grid.py +++ b/wxPython/src/gtk/grid.py @@ -393,7 +393,9 @@ class GridCellEditor(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _grid.GridCellEditor_Destroy(*args, **kwargs) + val = _grid.GridCellEditor_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class GridCellEditorPtr(GridCellEditor): @@ -1056,7 +1058,9 @@ class PyGridTableBase(GridTableBase): Deletes the C++ object this Python object is a proxy for. """ - return _grid.PyGridTableBase_Destroy(*args, **kwargs) + val = _grid.PyGridTableBase_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def base_GetTypeName(*args, **kwargs): """base_GetTypeName(self, int row, int col) -> String""" diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index 8cd1d2fa7e..072b118ad1 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -2162,7 +2163,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2494,31 +2495,30 @@ static void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ @@ -2531,7 +2531,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2617,7 +2617,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -3179,7 +3179,7 @@ static PyObject *_wrap_GridCellRenderer_Clone(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -3804,7 +3804,7 @@ static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -4101,7 +4101,7 @@ static PyObject *_wrap_GridCellEditor_Clone(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -5295,7 +5295,7 @@ static PyObject *_wrap_new_GridCellAttr(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 1); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)1); } return resultobj; fail: @@ -5323,7 +5323,7 @@ static PyObject *_wrap_GridCellAttr_Clone(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6190,7 +6190,7 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -6234,7 +6234,7 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -6348,7 +6348,7 @@ static PyObject *_wrap_new_GridCellAttrProvider(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 1); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)1); } return resultobj; fail: @@ -6422,7 +6422,7 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6713,7 +6713,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6916,7 +6916,7 @@ static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 0); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)0); } return resultobj; fail: @@ -6973,7 +6973,7 @@ static PyObject *_wrap_GridTableBase_GetView(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -8088,7 +8088,7 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -8957,7 +8957,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -9250,7 +9250,7 @@ static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -10176,7 +10176,7 @@ static PyObject *_wrap_Grid_GetTable(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -13349,7 +13349,7 @@ static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -15225,7 +15225,7 @@ static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15265,7 +15265,7 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15363,7 +15363,7 @@ static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -15403,7 +15403,7 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16346,7 +16346,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16386,7 +16386,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -16422,7 +16422,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } { if (temp2) @@ -16466,7 +16466,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } { if (temp2) diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py index 48ae5a0f97..e73b2e983b 100644 --- a/wxPython/src/gtk/html.py +++ b/wxPython/src/gtk/html.py @@ -2043,7 +2043,6 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) - def Destroy(self): pass class HtmlHelpControllerPtr(HtmlHelpController): def __init__(self, this): diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp index 7b15be6697..b54df24b80 100644 --- a/wxPython/src/gtk/html_wrap.cpp +++ b/wxPython/src/gtk/html_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1701,7 +1702,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1874,31 +1875,30 @@ SWIGINTERNINLINE PyObject* } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1970,7 +1970,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2242,7 +2242,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2522,7 +2522,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2953,7 +2953,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2989,7 +2989,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -3340,7 +3340,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3424,7 +3424,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -11680,7 +11680,7 @@ static PyObject *_wrap_HtmlHelpWindow_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpWindow_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12154,7 +12154,7 @@ static PyObject *_wrap_HtmlHelpWindow_GetToolBar(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12636,7 +12636,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetController(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12912,7 +12912,7 @@ static PyObject *_wrap_HtmlHelpDialog_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpDialog_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpDialog, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); diff --git a/wxPython/src/gtk/media_wrap.cpp b/wxPython/src/gtk/media_wrap.cpp index f635d0a9e6..8c59fb530e 100644 --- a/wxPython/src/gtk/media_wrap.cpp +++ b/wxPython/src/gtk/media_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1664,7 +1665,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1757,7 +1758,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/src/gtk/webkit_wrap.cpp b/wxPython/src/gtk/webkit_wrap.cpp index 4d75ad27f3..9ad142564b 100644 --- a/wxPython/src/gtk/webkit_wrap.cpp +++ b/wxPython/src/gtk/webkit_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1654,7 +1655,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/src/gtk/wizard_wrap.cpp b/wxPython/src/gtk/wizard_wrap.cpp index 181cf650cf..223e5526db 100644 --- a/wxPython/src/gtk/wizard_wrap.cpp +++ b/wxPython/src/gtk/wizard_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1651,7 +1652,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1845,31 +1846,30 @@ static bool wxPyWizardPage_Create(wxPyWizardPage *self,wxWizard *parent,wxBitmap return self->Create(parent, bitmap, res); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1996,7 +1996,7 @@ static PyObject *_wrap_WizardEvent_GetPage(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2095,7 +2095,7 @@ static PyObject *_wrap_WizardPage_GetPrev(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2123,7 +2123,7 @@ static PyObject *_wrap_WizardPage_GetNext(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3455,7 +3455,7 @@ static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3574,7 +3574,7 @@ static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: diff --git a/wxPython/src/gtk/xrc_wrap.cpp b/wxPython/src/gtk/xrc_wrap.cpp index b4d721646d..8e381a0453 100644 --- a/wxPython/src/gtk/xrc_wrap.cpp +++ b/wxPython/src/gtk/xrc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1607,7 +1608,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2562,7 +2563,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2610,7 +2611,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2710,7 +2711,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2810,7 +2811,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2918,7 +2919,7 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -5366,7 +5367,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *, PyObject *a if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5507,7 +5508,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5535,7 +5536,7 @@ static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6668,7 +6669,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index d1d07d0db2..03a2d01a11 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -2941,6 +2941,12 @@ def ToggleButton_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +BK_DEFAULT = _controls_.BK_DEFAULT +BK_TOP = _controls_.BK_TOP +BK_BOTTOM = _controls_.BK_BOTTOM +BK_LEFT = _controls_.BK_LEFT +BK_RIGHT = _controls_.BK_RIGHT +BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK class BookCtrlBase(_core.Control): """Proxy of C++ BookCtrlBase class""" def __init__(self): raise RuntimeError, "No constructor defined" @@ -2998,6 +3004,26 @@ class BookCtrlBase(_core.Control): """CalcSizeFromPage(self, Size sizePage) -> Size""" return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs) + def GetInternalBorder(*args, **kwargs): + """GetInternalBorder(self) -> unsigned int""" + return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs) + + def SetInternalBorder(*args, **kwargs): + """SetInternalBorder(self, unsigned int internalBorder)""" + return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs) + + def IsVertical(*args, **kwargs): + """IsVertical(self) -> bool""" + return _controls_.BookCtrlBase_IsVertical(*args, **kwargs) + + def SetShrinkMode(*args, **kwargs): + """SetShrinkMode(self, bool shrink)""" + return _controls_.BookCtrlBase_SetShrinkMode(*args, **kwargs) + + def GetShrinkMode(*args, **kwargs): + """GetShrinkMode(self) -> bool""" + return _controls_.BookCtrlBase_GetShrinkMode(*args, **kwargs) + def DeletePage(*args, **kwargs): """DeletePage(self, size_t n) -> bool""" return _controls_.BookCtrlBase_DeletePage(*args, **kwargs) @@ -3315,10 +3341,6 @@ class Listbook(BookCtrlBase): """ return _controls_.Listbook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Listbook_IsVertical(*args, **kwargs) - def GetListView(*args, **kwargs): """GetListView(self) -> ListView""" return _controls_.Listbook_GetListView(*args, **kwargs) @@ -3391,10 +3413,6 @@ class Choicebook(BookCtrlBase): """ return _controls_.Choicebook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Choicebook_IsVertical(*args, **kwargs) - def GetChoiceCtrl(*args, **kwargs): """GetChoiceCtrl(self) -> Choice""" return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs) @@ -3445,6 +3463,193 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C #--------------------------------------------------------------------------- +class Treebook(BookCtrlBase): + """Proxy of C++ Treebook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Treebook + """ + newobj = _controls_.new_Treebook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> bool + """ + return _controls_.Treebook_Create(*args, **kwargs) + + def InsertPage(*args, **kwargs): + """ + InsertPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertPage(*args, **kwargs) + + def InsertSubPage(*args, **kwargs): + """ + InsertSubPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertSubPage(*args, **kwargs) + + def AddPage(*args, **kwargs): + """AddPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddPage(*args, **kwargs) + + def AddSubPage(*args, **kwargs): + """AddSubPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddSubPage(*args, **kwargs) + + def DeletePage(*args, **kwargs): + """DeletePage(self, size_t pos) -> bool""" + return _controls_.Treebook_DeletePage(*args, **kwargs) + + def IsNodeExpanded(*args, **kwargs): + """IsNodeExpanded(self, size_t pos) -> bool""" + return _controls_.Treebook_IsNodeExpanded(*args, **kwargs) + + def ExpandNode(*args, **kwargs): + """ExpandNode(self, size_t pos, bool expand=True) -> bool""" + return _controls_.Treebook_ExpandNode(*args, **kwargs) + + def CollapseNode(*args, **kwargs): + """CollapseNode(self, size_t pos) -> bool""" + return _controls_.Treebook_CollapseNode(*args, **kwargs) + + def GetPageParent(*args, **kwargs): + """GetPageParent(self, size_t pos) -> int""" + return _controls_.Treebook_GetPageParent(*args, **kwargs) + + def GetTreeCtrl(*args, **kwargs): + """GetTreeCtrl(self) -> wxTreeCtrl""" + return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + + +class TreebookPtr(Treebook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Treebook +_controls_.Treebook_swigregister(TreebookPtr) + +def PreTreebook(*args, **kwargs): + """PreTreebook() -> Treebook""" + val = _controls_.new_PreTreebook(*args, **kwargs) + val.thisown = 1 + return val + +class TreebookEvent(BookCtrlBaseEvent): + """Proxy of C++ TreebookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> TreebookEvent + """ + newobj = _controls_.new_TreebookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class TreebookEventPtr(TreebookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = TreebookEvent +_controls_.TreebookEvent_swigregister(TreebookEventPtr) + +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING +wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED +wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED +EVT_TREEBOOK_PAGE_CHANGED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, 1 ) +EVT_TREEBOOK_PAGE_CHANGING= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, 1) +EVT_TREEBOOK_NODE_COLLAPSED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 1 ) +EVT_TREEBOOK_NODE_EXPANDED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, 1 ) + +#--------------------------------------------------------------------------- + +class Toolbook(BookCtrlBase): + """Proxy of C++ Toolbook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Toolbook + """ + newobj = _controls_.new_Toolbook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, String name=wxEmptyString) -> bool + """ + return _controls_.Toolbook_Create(*args, **kwargs) + + def GetToolBar(*args, **kwargs): + """GetToolBar(self) -> ToolBarBase""" + return _controls_.Toolbook_GetToolBar(*args, **kwargs) + + def Realize(*args, **kwargs): + """Realize(self)""" + return _controls_.Toolbook_Realize(*args, **kwargs) + + +class ToolbookPtr(Toolbook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Toolbook +_controls_.Toolbook_swigregister(ToolbookPtr) + +def PreToolbook(*args, **kwargs): + """PreToolbook() -> Toolbook""" + val = _controls_.new_PreToolbook(*args, **kwargs) + val.thisown = 1 + return val + +class ToolbookEvent(BookCtrlBaseEvent): + """Proxy of C++ ToolbookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> ToolbookEvent + """ + newobj = _controls_.new_ToolbookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class ToolbookEventPtr(ToolbookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = ToolbookEvent +_controls_.ToolbookEvent_swigregister(ToolbookEventPtr) + +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING +EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 1) +EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 1) + #--------------------------------------------------------------------------- TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON @@ -4080,6 +4285,12 @@ class ListItemAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_ListItemAttr): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTextColour(*args, **kwargs): """SetTextColour(self, Colour colText)""" return _controls_.ListItemAttr_SetTextColour(*args, **kwargs) @@ -4116,9 +4327,15 @@ class ListItemAttr(object): """GetFont(self) -> Font""" return _controls_.ListItemAttr_GetFont(*args, **kwargs) + def AssignFrom(*args, **kwargs): + """AssignFrom(self, ListItemAttr source)""" + return _controls_.ListItemAttr_AssignFrom(*args, **kwargs) + def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.ListItemAttr_Destroy(*args, **kwargs) + val = _controls_.ListItemAttr_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ListItemAttrPtr(ListItemAttr): @@ -5029,6 +5246,12 @@ class TreeItemData(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_TreeItemData): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetData(*args, **kwargs): """GetData(self) -> PyObject""" return _controls_.TreeItemData_GetData(*args, **kwargs) @@ -5047,7 +5270,9 @@ class TreeItemData(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.TreeItemData_Destroy(*args, **kwargs) + val = _controls_.TreeItemData_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class TreeItemDataPtr(TreeItemData): @@ -6154,7 +6379,9 @@ class HelpProvider(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.HelpProvider_Destroy(*args, **kwargs) + val = _controls_.HelpProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class HelpProviderPtr(HelpProvider): diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 5fef9ab8c3..09f6310eff 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,20 +1581,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[146] #define SWIGTYPE_p_wxToolBarBase swig_types[147] #define SWIGTYPE_p_wxToolBarToolBase swig_types[148] -#define SWIGTYPE_p_wxTreeEvent swig_types[149] -#define SWIGTYPE_p_wxTreeItemId swig_types[150] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] -#define SWIGTYPE_p_wxValidator swig_types[152] -#define SWIGTYPE_p_wxVisualAttributes swig_types[153] -#define SWIGTYPE_p_wxWindow swig_types[154] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[155] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] -#define SWIGTYPE_p_wxXPMHandler swig_types[157] -#define SWIGTYPE_ptrdiff_t swig_types[158] -#define SWIGTYPE_std__ptrdiff_t swig_types[159] -#define SWIGTYPE_unsigned_int swig_types[160] -static swig_type_info *swig_types[162]; -static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[149] +#define SWIGTYPE_p_wxToolbookEvent swig_types[150] +#define SWIGTYPE_p_wxTreeCtrl swig_types[151] +#define SWIGTYPE_p_wxTreeEvent swig_types[152] +#define SWIGTYPE_p_wxTreeItemId swig_types[153] +#define SWIGTYPE_p_wxTreebook swig_types[154] +#define SWIGTYPE_p_wxTreebookEvent swig_types[155] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[156] +#define SWIGTYPE_p_wxValidator swig_types[157] +#define SWIGTYPE_p_wxVisualAttributes swig_types[158] +#define SWIGTYPE_p_wxWindow swig_types[159] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[160] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[161] +#define SWIGTYPE_p_wxXPMHandler swig_types[162] +#define SWIGTYPE_ptrdiff_t swig_types[163] +#define SWIGTYPE_std__ptrdiff_t swig_types[164] +#define SWIGTYPE_unsigned_int swig_types[165] +static swig_type_info *swig_types[167]; +static swig_module_info swig_module = {swig_types, 166, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1657,7 +1663,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1805,14 +1811,14 @@ static void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObje self->Insert(item, pos); } static PyObject *wxListBox_GetSelections(wxListBox *self){ - wxArrayInt lst; - self->GetSelections(lst); - PyObject *tup = PyTuple_New(lst.GetCount()); - for(size_t i=0; iGetSelections(lst); + PyObject *tup = PyTuple_New(lst.GetCount()); + for(size_t i=0; iGetWindowStyle() & wxLB_OWNERDRAW) @@ -1833,31 +1839,30 @@ static void wxListBox_SetItemFont(wxListBox *self,int item,wxFont const &f){ } static const wxString wxPyTextCtrlNameStr(wxTextCtrlNameStr); - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1866,7 +1871,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1940,6 +1945,83 @@ SWIGINTERNINLINE PyObject* : PyInt_FromLong(static_cast(value)); } + +#if UINT_MAX < LONG_MAX +/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_long +/*@@*/ +#else +/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long +/*@@*/ +#endif + + +SWIGINTERNINLINE int + SWIG_CheckUnsignedLongInRange(unsigned long value, + unsigned long max_value, + const char *errmsg) +{ + if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %lu is greater than '%s' minimum %lu", + value, errmsg, max_value); + } + return 0; + } + return 1; + } + + +#if UINT_MAX != ULONG_MAX +SWIGINTERN int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + const char* errmsg = val ? "unsigned int" : (char*)0; + unsigned long v; + if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { + if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { + if (val) *val = static_cast(v); + return 1; + } + } else { + PyErr_Clear(); + } + if (val) { + SWIG_type_error(errmsg, obj); + } + return 0; +} +#else +SWIGINTERNINLINE unsigned int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); +} +#endif + + +SWIGINTERNINLINE unsigned int +SWIG_As_unsigned_SS_int(PyObject* obj) +{ + unsigned int v; + if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. + */ + memset((void*)&v, 0, sizeof(unsigned int)); + } + return v; +} + + +SWIGINTERNINLINE int +SWIG_Check_unsigned_SS_int(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); +} + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); static PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -2031,6 +2113,7 @@ public: // use the virtual version to avoid a confusing assert in the base class DEC_PYCALLBACK_INT_LONG_virtual(OnGetItemImage); + DEC_PYCALLBACK_INT_LONGLONG(OnGetItemColumnImage); PYPRIVATE; }; @@ -2040,7 +2123,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl); IMP_PYCALLBACK_STRING_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemText); IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); IMP_PYCALLBACK_INT_LONG_virtual(wxPyListCtrl, wxListCtrl, OnGetItemImage); - +IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage); + static wxListItem *wxPyListCtrl_GetColumn(wxPyListCtrl *self,int col){ wxListItem item; @@ -2142,83 +2226,6 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); - -#if UINT_MAX < LONG_MAX -/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_long -/*@@*/ -#else -/*@/opt/swig/share/swig/1.3.27/python/pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long -/*@@*/ -#endif - - -SWIGINTERNINLINE int - SWIG_CheckUnsignedLongInRange(unsigned long value, - unsigned long max_value, - const char *errmsg) -{ - if (value > max_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %lu is greater than '%s' minimum %lu", - value, errmsg, max_value); - } - return 0; - } - return 1; - } - - -#if UINT_MAX != ULONG_MAX -SWIGINTERN int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - const char* errmsg = val ? "unsigned int" : (char*)0; - unsigned long v; - if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { - if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { - if (val) *val = static_cast(v); - return 1; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_type_error(errmsg, obj); - } - return 0; -} -#else -SWIGINTERNINLINE unsigned int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); -} -#endif - - -SWIGINTERNINLINE unsigned int -SWIG_As_unsigned_SS_int(PyObject* obj) -{ - unsigned int v; - if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(unsigned int)); - } - return v; -} - - -SWIGINTERNINLINE int -SWIG_Check_unsigned_SS_int(PyObject* obj) -{ - return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); -} - static wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item); if (data == NULL) { @@ -16531,7 +16538,7 @@ static PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -16682,6 +16689,152 @@ static PyObject *_wrap_BookCtrlBase_CalcSizeFromPage(PyObject *, PyObject *args, } +static PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetInternalBorder",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "internalBorder", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetInternalBorder",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInternalBorder(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_IsVertical",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->IsVertical(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "shrink", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetShrinkMode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShrinkMode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_GetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetShrinkMode",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->GetShrinkMode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; @@ -17887,21 +18040,781 @@ static PyObject *_wrap_Listbook_Create(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListbook *arg1 = (wxListbook *) 0 ; + wxListView *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListView *)(arg1)->GetListView(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxListbookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) 0 ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxChoicebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxChoice *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeleteAllPages(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxChoicebookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Treebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxBK_DEFAULT ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxTreebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Treebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreTreebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreTreebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) wxBK_DEFAULT ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Treebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->InsertPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertSubPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_AddPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; bool result; + bool temp3 = false ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxListbook const *)arg1)->IsVertical(); + result = (bool)(arg1)->AddPage(arg2,(wxString const &)*arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -17909,52 +18822,302 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + { + if (temp3) + delete arg3; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } return NULL; } -static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Treebook_AddSubPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; - wxListView *result; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; + bool result; + bool temp3 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,(wxString const &)*arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp3) + delete arg3; + } + return resultobj; + fail: + { + if (temp3) + delete arg3; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_DeletePage",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeletePage(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_IsNodeExpanded(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_IsNodeExpanded",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreebook const *)arg1)->IsNodeExpanded(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_ExpandNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool arg3 = (bool) true ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "expand", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Treebook_ExpandNode",kwnames,&obj0,&obj1,&obj2)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_bool(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ExpandNode(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_CollapseNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_CollapseNode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CollapseNode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetPageParent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_GetPageParent",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxTreebook const *)arg1)->GetPageParent(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxTreeCtrl *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Treebook_GetTreeCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListView *)(arg1)->GetListView(); + result = (wxTreeCtrl *)((wxTreebook const *)arg1)->GetTreeCtrl(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreeCtrl, 0); return resultobj; fail: return NULL; } -static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { +static PyObject * Treebook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_TreebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxListbookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxTreebookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -17963,7 +19126,7 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TreebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -17990,26 +19153,26 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + result = (wxTreebookEvent *)new wxTreebookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * TreebookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Toolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -18017,10 +19180,10 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxBK_DEFAULT ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; - wxChoicebook *result; + wxToolbook *result; wxPoint temp3 ; wxSize temp4 ; bool temp6 = false ; @@ -18034,7 +19197,7 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Toolbook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18067,14 +19230,13 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } } { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + result = (wxToolbook *)new wxToolbook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); { if (temp6) delete arg6; @@ -18089,32 +19251,31 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } -static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PreToolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *result; + wxToolbook *result; char *kwnames[] = { NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreToolbook",kwnames)) goto fail; { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(); + result = (wxToolbook *)new wxToolbook(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Create(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxToolbook *arg1 = (wxToolbook *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; @@ -18122,7 +19283,7 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; long arg6 = (long) 0 ; - wxString const &arg7_defvalue = wxPyEmptyString ; + wxString const &arg7_defvalue = wxEmptyString ; wxString *arg7 = (wxString *) &arg7_defvalue ; bool result; wxPoint temp4 ; @@ -18139,8 +19300,8 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Toolbook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; @@ -18197,102 +19358,73 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k } -static PyObject *_wrap_Choicebook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; + wxToolBarBase *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_GetToolBar",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxChoicebook const *)arg1)->IsVertical(); + result = (wxToolBarBase *)((wxToolbook const *)arg1)->GetToolBar(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - wxChoice *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = wxPyMake_wxObject(result, (bool)0); } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Realize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_Realize",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->DeleteAllPages(); + (arg1)->Realize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { +static PyObject * Toolbook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_ToolbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxChoicebookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxToolbookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18301,7 +19433,7 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ToolbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -18328,22 +19460,22 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + result = (wxToolbookEvent *)new wxToolbookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * ToolbookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -18423,7 +19555,7 @@ static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19342,7 +20474,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -19472,7 +20604,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -19528,7 +20660,7 @@ static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19566,7 +20698,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19598,7 +20730,7 @@ static PyObject *_wrap_ToolBarBase_AddControl(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19636,7 +20768,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19698,7 +20830,7 @@ static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19732,7 +20864,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19766,7 +20898,7 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20839,7 +21971,7 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20873,7 +22005,7 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21140,7 +22272,7 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21265,6 +22397,31 @@ static PyObject *_wrap_new_ListItemAttr(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_ListItemAttr(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ListItemAttr",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21538,6 +22695,41 @@ static PyObject *_wrap_ListItemAttr_GetFont(PyObject *, PyObject *args, PyObject } +static PyObject *_wrap_ListItemAttr_AssignFrom(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + wxListItemAttr *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "source", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItemAttr_AssignFrom",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (arg2 == NULL) { + SWIG_null_ref("wxListItemAttr"); + } + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AssignFrom((wxListItemAttr const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21586,7 +22778,7 @@ static PyObject *_wrap_new_ListItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -23294,7 +24486,7 @@ static PyObject *_wrap_ListEvent_m_item_get(PyObject *, PyObject *args, PyObject result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24066,7 +25258,7 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24284,7 +25476,7 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25197,7 +26389,7 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -27262,6 +28454,31 @@ static PyObject *_wrap_new_TreeItemData(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_TreeItemData(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TreeItemData",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TreeItemData_GetData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; @@ -28364,7 +29581,7 @@ static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -28392,7 +29609,7 @@ static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -28919,7 +30136,7 @@ static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *, PyObject *args, PyObject } if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -29941,7 +31158,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *, PyObject *args, PyObject *kw } } if (obj4) { - SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(5)) SWIG_fail; } { @@ -30019,7 +31236,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -30107,7 +31324,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *, PyObject *args, PyObject } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30191,7 +31408,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *, PyObject *args, PyO } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30269,7 +31486,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -33510,7 +34727,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HelpProvider_Set",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33519,7 +34736,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 1); return resultobj; fail: return NULL; @@ -35287,6 +36504,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"BookCtrlBase_SetPageImage", (PyCFunction) _wrap_BookCtrlBase_SetPageImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_SetPageSize", (PyCFunction) _wrap_BookCtrlBase_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_CalcSizeFromPage", (PyCFunction) _wrap_BookCtrlBase_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_GetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_IsVertical", (PyCFunction) _wrap_BookCtrlBase_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_SetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_GetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction) _wrap_BookCtrlBase_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35318,7 +36540,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Listbook", (PyCFunction) _wrap_new_Listbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreListbook", (PyCFunction) _wrap_new_PreListbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_Create", (PyCFunction) _wrap_Listbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Listbook_IsVertical", (PyCFunction) _wrap_Listbook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_GetListView", (PyCFunction) _wrap_Listbook_GetListView, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_swigregister", Listbook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListbookEvent", (PyCFunction) _wrap_new_ListbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35326,12 +36547,35 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Choicebook", (PyCFunction) _wrap_new_Choicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreChoicebook", (PyCFunction) _wrap_new_PreChoicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_Create", (PyCFunction) _wrap_Choicebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Choicebook_IsVertical", (PyCFunction) _wrap_Choicebook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_GetChoiceCtrl", (PyCFunction) _wrap_Choicebook_GetChoiceCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_DeleteAllPages", (PyCFunction) _wrap_Choicebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_swigregister", Choicebook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ChoicebookEvent", (PyCFunction) _wrap_new_ChoicebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ChoicebookEvent_swigregister", ChoicebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Treebook", (PyCFunction) _wrap_new_Treebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreTreebook", (PyCFunction) _wrap_new_PreTreebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_Create", (PyCFunction) _wrap_Treebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertPage", (PyCFunction) _wrap_Treebook_InsertPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertSubPage", (PyCFunction) _wrap_Treebook_InsertSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddPage", (PyCFunction) _wrap_Treebook_AddPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddSubPage", (PyCFunction) _wrap_Treebook_AddSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_DeletePage", (PyCFunction) _wrap_Treebook_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_IsNodeExpanded", (PyCFunction) _wrap_Treebook_IsNodeExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_ExpandNode", (PyCFunction) _wrap_Treebook_ExpandNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_CollapseNode", (PyCFunction) _wrap_Treebook_CollapseNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetPageParent", (PyCFunction) _wrap_Treebook_GetPageParent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetTreeCtrl", (PyCFunction) _wrap_Treebook_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_swigregister", Treebook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_TreebookEvent", (PyCFunction) _wrap_new_TreebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreebookEvent_swigregister", TreebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Toolbook", (PyCFunction) _wrap_new_Toolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreToolbook", (PyCFunction) _wrap_new_PreToolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Create", (PyCFunction) _wrap_Toolbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_GetToolBar", (PyCFunction) _wrap_Toolbook_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Realize", (PyCFunction) _wrap_Toolbook_Realize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_swigregister", Toolbook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_ToolbookEvent", (PyCFunction) _wrap_new_ToolbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ToolbookEvent_swigregister", ToolbookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"ToolBarToolBase_GetId", (PyCFunction) _wrap_ToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetControl", (PyCFunction) _wrap_ToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetToolBar", (PyCFunction) _wrap_ToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35414,6 +36658,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItemAttr", (PyCFunction) _wrap_new_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ListItemAttr", (PyCFunction) _wrap_delete_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetTextColour", (PyCFunction) _wrap_ListItemAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetFont", (PyCFunction) _wrap_ListItemAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35423,6 +36668,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListItemAttr_GetTextColour", (PyCFunction) _wrap_ListItemAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetFont", (PyCFunction) _wrap_ListItemAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListItemAttr_AssignFrom", (PyCFunction) _wrap_ListItemAttr_AssignFrom, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_Destroy", (PyCFunction) _wrap_ListItemAttr_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_swigregister", ListItemAttr_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItem", (PyCFunction) _wrap_new_ListItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35598,6 +36844,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemId_m_pItem_get", (PyCFunction) _wrap_TreeItemId_m_pItem_get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemId_swigregister", TreeItemId_swigregister, METH_VARARGS, NULL}, { (char *)"new_TreeItemData", (PyCFunction) _wrap_new_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TreeItemData", (PyCFunction) _wrap_delete_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetData", (PyCFunction) _wrap_TreeItemData_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_SetData", (PyCFunction) _wrap_TreeItemData_SetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetId", (PyCFunction) _wrap_TreeItemData_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35861,6 +37108,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -35978,8 +37231,8 @@ static void *_p_wxToggleButtonTo_p_wxControl(void *x) { static void *_p_wxRadioButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxRadioButton *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -35993,6 +37246,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxGenericDirCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxGenericDirCtrl *) x)); } @@ -36053,8 +37309,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -36065,6 +37321,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -36098,12 +37357,24 @@ static void *_p_wxListbookEventTo_p_wxNotifyEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxNotifyEvent(void *x) { return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxChoicebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxChoicebook *) x)); } static void *_p_wxListbookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxListbook *) x)); } +static void *_p_wxToolbookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxToolbook *) x)); +} +static void *_p_wxTreebookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -36131,18 +37402,21 @@ static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) ((wxWindow *) x)); } static void *_p_wxControlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxComboBoxTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxComboBox *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxPyListCtrlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxPyListCtrl *) x)); } @@ -36215,6 +37489,9 @@ static void *_p_wxStaticBoxTo_p_wxEvtHandler(void *x) { static void *_p_wxSliderTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSpinButton *) x)); } @@ -36251,6 +37528,9 @@ static void *_p_wxSimpleHelpProviderTo_p_wxHelpProvider(void *x) { static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxGBSizerItemTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizerItem *) ((wxGBSizerItem *) x)); } @@ -36359,6 +37639,9 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { static void *_p_wxPySizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxPySizer *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -36536,6 +37819,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -36632,21 +37921,24 @@ static void *_p_wxToggleButtonTo_p_wxWindow(void *x) { static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } static void *_p_wxToolBarBaseTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxToolBarBase *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } static void *_p_wxComboBoxTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxComboBox *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyControl *) x)); } @@ -36710,6 +38002,9 @@ static void *_p_wxStaticBoxTo_p_wxWindow(void *x) { static void *_p_wxSliderTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSpinButton *) x)); } @@ -36737,6 +38032,12 @@ static void *_p_wxListbookEventTo_p_wxBookCtrlBaseEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent(void *x) { return (void *)((wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -36764,6 +38065,12 @@ static void *_p_wxNotebookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -36864,9 +38171,9 @@ static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMoveEvent = {"_p_wxMoveEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPaintEvent = {"_p_wxPaintEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxNcPaintEvent = {"_p_wxNcPaintEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0}; @@ -36914,8 +38221,6 @@ static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0 static swig_type_info _swigt__p_wxFSFile = {"_p_wxFSFile", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPySizer = {"_p_wxPySizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; @@ -36927,6 +38232,8 @@ static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImage = {"_p_wxImage", 0, 0, 0, 0}; @@ -36959,8 +38266,13 @@ static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", "wxToggle static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", "wxToolBar *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", "wxToolBarBase *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", "wxToolBarToolBase *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", "wxToolbook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", "wxToolbookEvent *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreeCtrl = {"_p_wxTreeCtrl", "wxTreeCtrl *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeEvent = {"_p_wxTreeEvent", "wxTreeEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeItemId = {"_p_wxTreeItemId", "wxTreeItemId *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", "wxTreebook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", "wxTreebookEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxValidator = {"_p_wxValidator", "wxValidator *", 0, 0, 0}; static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, 0}; static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, 0}; @@ -37118,8 +38430,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, + &_swigt__p_wxTreeCtrl, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxVisualAttributes, @@ -37145,8 +38462,8 @@ static swig_cast_info _swigc__p_wxArrayInt[] = { {&_swigt__p_wxArrayInt, 0, 0, static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = { {&_swigt__p_wxBitmapButton, 0, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxBitmapButton, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = { {&_swigt__p_wxButton, 0, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxButton, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxButton, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckBox[] = { {&_swigt__p_wxCheckBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckListBox[] = { {&_swigt__p_wxCheckListBox, 0, 0, 0},{0, 0, 0, 0}}; @@ -37163,10 +38480,10 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelp[] = { {&_swigt__p_wxContextHelp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelpButton[] = { {&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = { {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxControlWithItems, 0, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControlWithItems, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCursor[] = { {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDC[] = { {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -37189,21 +38506,21 @@ static swig_cast_info _swigc__p_wxSizeEvent[] = {{&_swigt__p_wxSizeEvent, 0, 0, static swig_cast_info _swigc__p_wxMoveEvent[] = {{&_swigt__p_wxMoveEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaintEvent[] = {{&_swigt__p_wxPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNcPaintEvent[] = {{&_swigt__p_wxNcPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuBar[] = {{&_swigt__p_wxMenuBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = {{&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGauge[] = { {&_swigt__p_wxGauge, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = { {&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37225,7 +38542,7 @@ static swig_cast_info _swigc__p_wxMemoryDC[] = { {&_swigt__p_wxMemoryDC, 0, 0, static swig_cast_info _swigc__p_wxMouseEvent[] = { {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebook[] = { {&_swigt__p_wxNotebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebookEvent[] = { {&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}}; @@ -37239,8 +38556,6 @@ static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer static swig_cast_info _swigc__p_wxFSFile[] = {{&_swigt__p_wxFSFile, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPySizer[] = {{&_swigt__p_wxPySizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -37252,11 +38567,13 @@ static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFileSystem[] = {{&_swigt__p_wxFileSystem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = { {&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37285,11 +38602,16 @@ static swig_cast_info _swigc__p_wxToggleButton[] = { {&_swigt__p_wxToggleButton static swig_cast_info _swigc__p_wxToolBar[] = { {&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = { {&_swigt__p_wxToolBarBase, 0, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxToolBarBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = { {&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = { {&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = { {&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreeCtrl[] = { {&_swigt__p_wxTreeCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeEvent[] = { {&_swigt__p_wxTreeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = { {&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = { {&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxVisualAttributes[] = { {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -37444,8 +38766,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, + _swigc__p_wxTreeCtrl, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxVisualAttributes, @@ -38215,6 +39542,24 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NotebookNameStr",_wrap_NotebookNameStr_get, _wrap_NotebookNameStr_set); + { + PyDict_SetItemString(d,"BK_DEFAULT", SWIG_From_int(static_cast(wxBK_DEFAULT))); + } + { + PyDict_SetItemString(d,"BK_TOP", SWIG_From_int(static_cast(wxBK_TOP))); + } + { + PyDict_SetItemString(d,"BK_BOTTOM", SWIG_From_int(static_cast(wxBK_BOTTOM))); + } + { + PyDict_SetItemString(d,"BK_LEFT", SWIG_From_int(static_cast(wxBK_LEFT))); + } + { + PyDict_SetItemString(d,"BK_RIGHT", SWIG_From_int(static_cast(wxBK_RIGHT))); + } + { + PyDict_SetItemString(d,"BK_ALIGN_MASK", SWIG_From_int(static_cast(wxBK_ALIGN_MASK))); + } { PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_From_int(static_cast(wxNB_FIXEDWIDTH))); } @@ -38290,6 +39635,12 @@ SWIGEXPORT void SWIG_init(void) { } PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING)); { PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_From_int(static_cast(wxTOOL_STYLE_BUTTON))); } diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index f7ad0825f6..39847bbff4 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -708,7 +708,9 @@ class Object(object): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Object_Destroy(*args, **kwargs) + val = _core_.Object_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ObjectPtr(Object): @@ -2415,7 +2417,9 @@ class Image(Object): Destroys the image data. """ - return _core_.Image_Destroy(*args, **kwargs) + val = _core_.Image_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def Scale(*args, **kwargs): """ @@ -3596,7 +3600,9 @@ class EvtHandler(Object): def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self, bool incref=True)""" - return _core_.EvtHandler__setOORInfo(*args, **kwargs) + val = _core_.EvtHandler__setOORInfo(*args, **kwargs) + args[0].thisown = 0 + return val def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): """ @@ -8109,7 +8115,9 @@ class Window(EvtHandler): Returns True if the window has either been successfully deleted, or it has been added to the list of windows pending real deletion. """ - return _core_.Window_Destroy(*args, **kwargs) + val = _core_.Window_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyChildren(*args, **kwargs): """ @@ -10157,6 +10165,9 @@ class Window(EvtHandler): if hasattr(self, '_setCallbackInfo'): self._setCallbackInfo(self, self.__class__) + def SendSizeEvent(self): + self.GetEventhandler().ProcessEvent(wx.SizeEvent((-1,-1))) + class WindowPtr(Window): def __init__(self, this): @@ -10513,7 +10524,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_Destroy(*args, **kwargs) + val = _core_.Menu_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyId(*args, **kwargs): """ @@ -10521,7 +10534,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyId(*args, **kwargs) + val = _core_.Menu_DestroyId(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyItem(*args, **kwargs): """ @@ -10529,7 +10544,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyItem(*args, **kwargs) + val = _core_.Menu_DestroyItem(*args, **kwargs) + args[0].thisown = 0 + return val def GetMenuItemCount(*args, **kwargs): """GetMenuItemCount(self) -> size_t""" @@ -11336,6 +11353,12 @@ class SizerItem(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_SizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def DeleteWindows(*args, **kwargs): """ DeleteWindows(self) @@ -11681,6 +11704,12 @@ class Sizer(Object): def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __del__(self, destroy=_core_.delete_Sizer): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self)""" return _core_.Sizer__setOORInfo(*args, **kwargs) @@ -12604,6 +12633,12 @@ class GBPosition(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBPosition): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRow(*args, **kwargs): """GetRow(self) -> int""" return _core_.GBPosition_GetRow(*args, **kwargs) @@ -12683,6 +12718,12 @@ class GBSpan(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSpan): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRowspan(*args, **kwargs): """GetRowspan(self) -> int""" return _core_.GBSpan_GetRowspan(*args, **kwargs) @@ -12763,6 +12804,12 @@ class GBSizerItem(SizerItem): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetPos(*args, **kwargs): """ GetPos(self) -> GBPosition diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 811ef6bcd5..fdc4899512 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1673,8 +1674,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyObject* robj = NULL; swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr")); +#if SWIG_VERSION < 0x010328 #ifdef SWIG_COBJECT_TYPES robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name); #else @@ -1684,7 +1686,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyString_FromString(result) : 0; } #endif - +#else // SWIG_VERSION >= 1.3.28 + robj = PySwigObject_New(ptr, swigType, 0); +#endif return robj; } @@ -1845,7 +1849,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1918,7 +1922,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2032,31 +2036,30 @@ static PyObject *wxRect_Get(wxRect *self){ } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){ @@ -2343,7 +2346,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -3150,6 +3153,8 @@ static wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=0,in wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -3170,6 +3175,8 @@ static wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int p wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Insert method if a valid item type was found @@ -3190,6 +3197,8 @@ static wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion= wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Prepend method if a valid item type was found @@ -3374,6 +3383,8 @@ static wxGBSizerItem *wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxG wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -8159,7 +8170,7 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -8533,7 +8544,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -8900,7 +8911,7 @@ static PyObject *_wrap_new_FileSystem(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -9042,7 +9053,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -9391,7 +9402,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9518,7 +9529,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9916,7 +9927,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -15849,7 +15860,7 @@ static PyObject *_wrap_Event_GetEventObject(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17186,7 +17197,7 @@ static PyObject *_wrap_new_MouseEvent(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -20582,7 +20593,7 @@ static PyObject *_wrap_EraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20655,7 +20666,7 @@ static PyObject *_wrap_FocusEvent_GetWindow(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20747,7 +20758,7 @@ static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21000,7 +21011,7 @@ static PyObject *_wrap_MenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22090,7 +22101,7 @@ static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22213,7 +22224,7 @@ static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22574,7 +22585,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22666,7 +22677,7 @@ static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22729,7 +22740,7 @@ static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24111,7 +24122,7 @@ static PyObject *_wrap_PyApp_GetTopWindow(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -29396,7 +29407,7 @@ static PyObject *_wrap_Window_GetValidator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -31002,7 +31013,7 @@ static PyObject *_wrap_Window_SetCaret(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCaret",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32411,7 +32422,7 @@ static PyObject *_wrap_Window_SetToolTip(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTip",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32447,7 +32458,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32698,7 +32709,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32735,7 +32746,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32777,7 +32788,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32834,7 +32845,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33529,7 +33540,7 @@ static PyObject *_wrap_Menu_Append(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33573,7 +33584,7 @@ static PyObject *_wrap_Menu_AppendSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33626,7 +33637,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33695,7 +33706,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33768,7 +33779,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33816,7 +33827,7 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33879,7 +33890,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33946,7 +33957,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -33996,7 +34007,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34055,7 +34066,7 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34130,7 +34141,7 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34209,7 +34220,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34257,7 +34268,7 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34318,7 +34329,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34362,7 +34373,7 @@ static PyObject *_wrap_Menu_PrependSeparator(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34415,7 +34426,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34484,7 +34495,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34557,7 +34568,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34607,7 +34618,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34639,7 +34650,7 @@ static PyObject *_wrap_Menu_RemoveItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34928,7 +34939,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34962,7 +34973,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -35548,7 +35559,7 @@ static PyObject *_wrap_Menu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36227,7 +36238,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36611,7 +36622,7 @@ static PyObject *_wrap_MenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36825,7 +36836,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -39251,6 +39262,31 @@ static PyObject *_wrap_new_SizerItem(PyObject *, PyObject *args, PyObject *kwarg } +static PyObject *_wrap_delete_SizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_SizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_SizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -39375,7 +39411,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = static_cast(SWIG_As_int(obj1)); @@ -39519,8 +39555,10 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *, PyObject *args, PyObject *k static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxPoint arg2 ; - wxSize arg3 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -39532,28 +39570,16 @@ static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObje SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxPoint * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxPoint"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { - wxSize * argp; - SWIG_Python_ConvertPtr(obj2, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(3)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxSize"); - } - if (SWIG_arg_fail(3)) SWIG_fail; - arg3 = *argp; + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDimension(arg2,arg3); + (arg1)->SetDimension((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -40158,7 +40184,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -40179,7 +40205,7 @@ static PyObject *_wrap_SizerItem_SetSizer(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40406,6 +40432,31 @@ static PyObject * SizerItem_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static PyObject *_wrap_delete_Sizer(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Sizer",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Sizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizer *arg1 = (wxSizer *) 0 ; @@ -40754,7 +40805,7 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40790,7 +40841,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kw arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40820,7 +40871,7 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_PrependItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -41618,7 +41669,7 @@ static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42504,7 +42555,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetAffirmativeButton(PyObject *, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42532,7 +42583,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetApplyButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42560,7 +42611,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetNegativeButton(PyObject *, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42588,7 +42639,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetCancelButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42616,7 +42667,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetHelpButton(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42669,6 +42720,31 @@ static PyObject *_wrap_new_GBPosition(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_delete_GBPosition(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBPosition *arg1 = (wxGBPosition *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBPosition",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBPosition *arg1 = (wxGBPosition *) 0 ; @@ -42969,6 +43045,31 @@ static PyObject *_wrap_new_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSpan *arg1 = (wxGBSpan *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSpan",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBSpan *arg1 = (wxGBSpan *) 0 ; @@ -43267,6 +43368,31 @@ static PyObject *_wrap_new_GBSizerItem(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_GBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_GBSizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -43346,7 +43472,7 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; @@ -43867,7 +43993,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -47311,6 +47437,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerItem", (PyCFunction) _wrap_delete_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47348,6 +47475,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetUserData", (PyCFunction) _wrap_SizerItem_SetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS, NULL}, + { (char *)"delete_Sizer", (PyCFunction) _wrap_delete_Sizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47423,6 +47551,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StdDialogButtonSizer_GetHelpButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetHelpButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StdDialogButtonSizer_swigregister", StdDialogButtonSizer_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBPosition", (PyCFunction) _wrap_delete_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47433,6 +47562,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSpan", (PyCFunction) _wrap_delete_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47443,6 +47573,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSizerItem", (PyCFunction) _wrap_delete_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index cecd234e41..3061bfd021 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -4207,10 +4207,7 @@ class BufferedDC(MemoryDC): def __init__(self, *args): """ __init__(self, DC dc, Bitmap buffer=NullBitmap, int style=BUFFER_CLIENT_AREA) -> BufferedDC - __init__(self, DC dc, Bitmap buffer=NullBitmap) -> BufferedDC - __init__(self, DC dc) -> BufferedDC __init__(self, DC dc, Size area, int style=BUFFER_CLIENT_AREA) -> BufferedDC - __init__(self, DC dc, Size area) -> BufferedDC Constructs a buffered DC. """ diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index c1ccf0d7b6..63bd40c466 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1624,7 +1625,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1711,7 +1712,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1863,31 +1864,30 @@ SWIG_Check_int(PyObject* obj) /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPen_GetDashes(wxPen *self){ @@ -2240,7 +2240,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -17493,27 +17493,32 @@ static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; - wxBitmap *arg2 = 0 ; - int arg3 ; + wxBitmap const &arg2_defvalue = wxNullBitmap ; + wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|OO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg2 == NULL) { - SWIG_null_ref("wxBitmap"); + if (obj1) { + { + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (arg2 == NULL) { + SWIG_null_ref("wxBitmap"); + } + if (SWIG_arg_fail(2)) SWIG_fail; } - if (SWIG_arg_fail(2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } } { if (!wxPyCheckForApp()) SWIG_fail; @@ -17531,84 +17536,28 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxBitmap *arg2 = 0 ; - wxBufferedDC *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg2 == NULL) { - SWIG_null_ref("wxBitmap"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_BufferedDC__SWIG_2(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxBufferedDC *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:new_BufferedDC",&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; - int arg3 ; + int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_int(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } } { if (!wxPyCheckForApp()) SWIG_fail; @@ -17625,37 +17574,6 @@ static PyObject *_wrap_new_BufferedDC__SWIG_3(PyObject *, PyObject *args) { } -static PyObject *_wrap_new_BufferedDC__SWIG_4(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxDC *arg1 = (wxDC *) 0 ; - wxSize *arg2 = 0 ; - wxBufferedDC *result; - wxSize temp2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDC, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = &temp2; - if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBufferedDC, 1); - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; PyObject *argv[4]; @@ -17665,7 +17583,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 1) { + if ((argc >= 1) && (argc <= 3)) { int _v; { void *ptr; @@ -17677,21 +17595,9 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_2(self,args); - } - } - if (argc == 2) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 1) { + return _wrap_new_BufferedDC__SWIG_0(self,args); } - } - if (_v) { { void *ptr = 0; if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { @@ -17702,54 +17608,17 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); - } - } - } - if (argc == 2) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); - } - if (_v) { - return _wrap_new_BufferedDC__SWIG_4(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDC, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); - } - if (_v) { + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_0(self,args); + } _v = SWIG_Check_int(argv[2]); if (_v) { - return _wrap_new_BufferedDC__SWIG_3(self,args); + return _wrap_new_BufferedDC__SWIG_0(self,args); } } } } - if (argc == 3) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -17762,18 +17631,15 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } if (_v) { { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } + _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { + if (argc <= 2) { + return _wrap_new_BufferedDC__SWIG_1(self,args); + } _v = SWIG_Check_int(argv[2]); if (_v) { - return _wrap_new_BufferedDC__SWIG_0(self,args); + return _wrap_new_BufferedDC__SWIG_1(self,args); } } } @@ -18750,7 +18616,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 641301f145..988ad85f55 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -778,6 +778,12 @@ class ToolTip(_core.Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_ToolTip): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTip(*args, **kwargs): """SetTip(self, String tip)""" return _misc_.ToolTip_SetTip(*args, **kwargs) @@ -826,13 +832,21 @@ class Caret(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Caret): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def Destroy(*args, **kwargs): """ Destroy(self) Deletes the C++ object this Python object is a proxy for. """ - return _misc_.Caret_Destroy(*args, **kwargs) + val = _misc_.Caret_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -1310,7 +1324,6 @@ class TimerRunner(object): """ __init__(self, wxTimer timer) -> TimerRunner __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner - __init__(self, wxTimer timer, int milli) -> TimerRunner """ newobj = _misc_.new_TimerRunner(*args) self.this = newobj.this @@ -1367,6 +1380,12 @@ class Log(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Log): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def IsEnabled(*args, **kwargs): """IsEnabled() -> bool""" return _misc_.Log_IsEnabled(*args, **kwargs) @@ -1488,7 +1507,9 @@ class Log(object): TimeStamp = staticmethod(TimeStamp) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.Log_Destroy(*args, **kwargs) + val = _misc_.Log_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class LogPtr(Log): @@ -2691,6 +2712,12 @@ class ArtProvider(object): del newobj.thisown self._setCallbackInfo(self, ArtProvider) + def __del__(self, destroy=_misc_.delete_ArtProvider): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs) @@ -2720,7 +2747,9 @@ class ArtProvider(object): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val RemoveProvider = staticmethod(RemoveProvider) def GetBitmap(*args, **kwargs): @@ -2755,7 +2784,9 @@ class ArtProvider(object): GetSizeHint = staticmethod(GetSizeHint) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.ArtProvider_Destroy(*args, **kwargs) + val = _misc_.ArtProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ArtProviderPtr(ArtProvider): @@ -2844,7 +2875,9 @@ def ArtProvider_RemoveProvider(*args, **kwargs): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val def ArtProvider_GetBitmap(*args, **kwargs): """ @@ -4840,7 +4873,6 @@ class DataObject(object): GetDataHere(self, DataFormat format) -> String Get the data bytes in the specified format, returns None on failure. - """ return _misc_.DataObject_GetDataHere(*args, **kwargs) diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index aeda3a44dc..0e60ce386e 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1666,7 +1667,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1802,31 +1803,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1835,7 +1835,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2134,7 +2134,7 @@ static wxString wxLog_TimeStamp(){ return msg; } static void wxLog_Destroy(wxLog *self){ delete self; } -// Make somce wrappers that double any % signs so they are 'escaped' +// Make some wrappers that double any % signs so they are 'escaped' void wxPyLogFatalError(const wxString& msg) { wxString m(msg); @@ -2655,7 +2655,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -7006,9 +7006,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolTip, 1); { if (temp1) delete arg1; @@ -7023,6 +7021,31 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxToolTip *arg1 = (wxToolTip *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ToolTip",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ToolTip_SetTip(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxToolTip *arg1 = (wxToolTip *) 0 ; @@ -7219,6 +7242,31 @@ static PyObject *_wrap_new_Caret(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Caret(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxCaret *arg1 = (wxCaret *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Caret",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Caret_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxCaret *arg1 = (wxCaret *) 0 ; @@ -9460,13 +9508,13 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxTimer *arg1 = 0 ; int arg2 ; - bool arg3 ; + bool arg3 = (bool) false ; wxTimerRunner *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_TimerRunner",&obj0,&obj1,&obj2)) goto fail; { SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTimer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; @@ -9479,50 +9527,16 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *, PyObject *args) { arg2 = static_cast(SWIG_As_int(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - { - arg3 = static_cast(SWIG_As_bool(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimerRunner, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_TimerRunner__SWIG_2(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxTimer *arg1 = 0 ; - int arg2 ; - wxTimerRunner *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_TimerRunner",&obj0,&obj1)) goto fail; - { - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTimer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (arg1 == NULL) { - SWIG_null_ref("wxTimer"); + if (obj2) { + { + arg3 = static_cast(SWIG_As_bool(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; } - if (SWIG_arg_fail(1)) SWIG_fail; - } - { - arg2 = static_cast(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2); + result = (wxTimerRunner *)new wxTimerRunner(*arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -9558,25 +9572,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { return _wrap_new_TimerRunner__SWIG_0(self,args); } } - if (argc == 2) { - int _v; - { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxTimer, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } - } - if (_v) { - _v = SWIG_Check_int(argv[1]); - if (_v) { - return _wrap_new_TimerRunner__SWIG_2(self,args); - } - } - } - if (argc == 3) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr = 0; @@ -9590,6 +9586,9 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) { if (_v) { _v = SWIG_Check_int(argv[1]); if (_v) { + if (argc <= 2) { + return _wrap_new_TimerRunner__SWIG_1(self,args); + } _v = SWIG_Check_bool(argv[2]); if (_v) { return _wrap_new_TimerRunner__SWIG_1(self,args); @@ -9696,6 +9695,31 @@ static PyObject *_wrap_new_Log(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Log(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxLog *arg1 = (wxLog *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Log",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Log_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; bool result; @@ -9867,7 +9891,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetActiveTarget",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9876,7 +9900,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 1); return resultobj; fail: return NULL; @@ -10560,7 +10584,7 @@ static PyObject *_wrap_LogWindow_GetFrame(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12491,7 +12515,11 @@ static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) { { PyObject* o; o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj, o); + + + } return resultobj; fail: @@ -17485,6 +17513,31 @@ static PyObject *_wrap_new_ArtProvider(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_ArtProvider(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArtProvider",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; @@ -17525,7 +17578,7 @@ static PyObject *_wrap_ArtProvider_PushProvider(PyObject *, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32792,6 +32845,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MutexGuiLocker_swigregister", MutexGuiLocker_swigregister, METH_VARARGS, NULL}, { (char *)"Thread_IsMain", (PyCFunction) _wrap_Thread_IsMain, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_ToolTip", (PyCFunction) _wrap_new_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ToolTip", (PyCFunction) _wrap_delete_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_SetTip", (PyCFunction) _wrap_ToolTip_SetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetTip", (PyCFunction) _wrap_ToolTip_GetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetWindow", (PyCFunction) _wrap_ToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32799,6 +32853,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolTip_SetDelay", (PyCFunction) _wrap_ToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_swigregister", ToolTip_swigregister, METH_VARARGS, NULL}, { (char *)"new_Caret", (PyCFunction) _wrap_new_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_Destroy", (PyCFunction) _wrap_Caret_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32882,6 +32937,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TimerRunner_Start", (PyCFunction) _wrap_TimerRunner_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TimerRunner_swigregister", TimerRunner_swigregister, METH_VARARGS, NULL}, { (char *)"new_Log", (PyCFunction) _wrap_new_Log, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Log", (PyCFunction) _wrap_delete_Log, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_IsEnabled", (PyCFunction) _wrap_Log_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_EnableLogging", (PyCFunction) _wrap_Log_EnableLogging, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_OnLog", (PyCFunction) _wrap_Log_OnLog, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33099,6 +33155,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS, NULL}, { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ArtProvider", (PyCFunction) _wrap_delete_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 56bf8701e1..2cbadcd07a 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -699,9 +699,6 @@ class Dialog(TopLevelWindow): return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) - def SendSizeEvent(self): - self.ProcessEvent(wx.SizeEvent((-1,-1))) - class DialogPtr(Dialog): def __init__(self, this): @@ -2170,6 +2167,12 @@ class TaskBarIcon(_core.EvtHandler): del newobj.thisown self._setCallbackInfo(self, TaskBarIcon, 0) + def __del__(self, destroy=_windows_.delete_TaskBarIcon): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) @@ -2180,7 +2183,9 @@ class TaskBarIcon(_core.EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _windows_.TaskBarIcon_Destroy(*args, **kwargs) + val = _windows_.TaskBarIcon_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -4694,7 +4699,6 @@ class PrintPreview(_core.Object): def __init__(self, *args): """ __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview - __init__(self, Printout printout, Printout printoutForPrinting) -> PrintPreview __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview """ newobj = _windows_.new_PrintPreview(*args) @@ -4805,7 +4809,6 @@ class PyPrintPreview(PrintPreview): def __init__(self, *args): """ __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview - __init__(self, Printout printout, Printout printoutForPrinting) -> PyPrintPreview __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview """ newobj = _windows_.new_PyPrintPreview(*args) diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 2c3d1d1ffc..0ba87c6b23 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1652,7 +1653,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1781,31 +1782,30 @@ SWIG_Check_bool(PyObject* obj) /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1817,7 +1817,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1975,7 +1975,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -5267,7 +5267,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp5) @@ -5303,7 +5303,7 @@ static PyObject *_wrap_Frame_GetStatusBar(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5616,7 +5616,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -5652,7 +5652,7 @@ static PyObject *_wrap_Frame_GetToolBar(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6126,7 +6126,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -6184,7 +6184,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -13021,6 +13021,31 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; @@ -17377,7 +17402,7 @@ static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17405,7 +17430,7 @@ static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -23916,7 +23941,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -24170,7 +24195,7 @@ static PyObject *_wrap_Printer_PrintDialog(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24292,7 +24317,7 @@ static PyObject *_wrap_new_Printout(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp1) @@ -24391,7 +24416,7 @@ static PyObject *_wrap_Printout_GetDC(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25605,19 +25630,21 @@ static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintDialogData *arg3 = (wxPrintDialogData *) 0 ; + wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ; wxPrintPreview *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -25634,34 +25661,6 @@ static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_PrintPreview__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintPreview *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_PrintPreview",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPrintPreview *)new wxPrintPreview(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintPreview, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PrintPreview__SWIG_2(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; @@ -25702,7 +25701,7 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -25724,32 +25723,9 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PrintPreview__SWIG_1(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 2) { + return _wrap_new_PrintPreview__SWIG_0(self,args); } - } - if (_v) { { void *ptr; if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) { @@ -25797,7 +25773,7 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PrintPreview__SWIG_2(self,args); + return _wrap_new_PrintPreview__SWIG_1(self,args); } } } @@ -25919,7 +25895,7 @@ static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25947,7 +25923,7 @@ static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -26487,19 +26463,21 @@ static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPrintDialogData *arg3 = (wxPrintDialogData *) 0 ; + wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ; wxPyPrintPreview *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; + if (obj2) { + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + } { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -26516,34 +26494,6 @@ static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *, PyObject *args) { static PyObject *_wrap_new_PyPrintPreview__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj = NULL; - wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; - wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; - wxPyPrintPreview *result; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"OO:new_PyPrintPreview",&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPyPrintout, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPyPrintPreview *)new wxPyPrintPreview(arg1,arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPrintPreview, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PyPrintPreview__SWIG_2(PyObject *, PyObject *args) { PyObject *resultobj = NULL; wxPyPrintout *arg1 = (wxPyPrintout *) 0 ; wxPyPrintout *arg2 = (wxPyPrintout *) 0 ; @@ -26584,7 +26534,7 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } - if (argc == 2) { + if ((argc >= 2) && (argc <= 3)) { int _v; { void *ptr; @@ -26606,32 +26556,9 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PyPrintPreview__SWIG_1(self,args); - } - } - } - if (argc == 3) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; + if (argc <= 2) { + return _wrap_new_PyPrintPreview__SWIG_0(self,args); } - } - if (_v) { { void *ptr; if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) { @@ -26679,7 +26606,7 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) { } } if (_v) { - return _wrap_new_PyPrintPreview__SWIG_2(self,args); + return _wrap_new_PyPrintPreview__SWIG_1(self,args); } } } @@ -27727,6 +27654,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL}, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp index fb358f4840..dd618991fb 100644 --- a/wxPython/src/mac/calendar_wrap.cpp +++ b/wxPython/src/mac/calendar_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1596,7 +1597,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1726,7 +1727,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index c64631e582..31c0d4da8e 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -393,7 +393,9 @@ class GridCellEditor(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _grid.GridCellEditor_Destroy(*args, **kwargs) + val = _grid.GridCellEditor_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class GridCellEditorPtr(GridCellEditor): @@ -1056,7 +1058,9 @@ class PyGridTableBase(GridTableBase): Deletes the C++ object this Python object is a proxy for. """ - return _grid.PyGridTableBase_Destroy(*args, **kwargs) + val = _grid.PyGridTableBase_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def base_GetTypeName(*args, **kwargs): """base_GetTypeName(self, int row, int col) -> String""" diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 0bd40f5336..02f48ca9a6 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -2162,7 +2163,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2494,31 +2495,30 @@ static void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ @@ -2531,7 +2531,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2617,7 +2617,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -3179,7 +3179,7 @@ static PyObject *_wrap_GridCellRenderer_Clone(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -3804,7 +3804,7 @@ static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -4101,7 +4101,7 @@ static PyObject *_wrap_GridCellEditor_Clone(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -5295,7 +5295,7 @@ static PyObject *_wrap_new_GridCellAttr(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 1); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)1); } return resultobj; fail: @@ -5323,7 +5323,7 @@ static PyObject *_wrap_GridCellAttr_Clone(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6190,7 +6190,7 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -6234,7 +6234,7 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -6348,7 +6348,7 @@ static PyObject *_wrap_new_GridCellAttrProvider(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 1); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)1); } return resultobj; fail: @@ -6422,7 +6422,7 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6713,7 +6713,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6916,7 +6916,7 @@ static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 0); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)0); } return resultobj; fail: @@ -6973,7 +6973,7 @@ static PyObject *_wrap_GridTableBase_GetView(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -8088,7 +8088,7 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -8957,7 +8957,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -9250,7 +9250,7 @@ static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -10176,7 +10176,7 @@ static PyObject *_wrap_Grid_GetTable(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -13349,7 +13349,7 @@ static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -15225,7 +15225,7 @@ static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15265,7 +15265,7 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15363,7 +15363,7 @@ static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -15403,7 +15403,7 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16346,7 +16346,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16386,7 +16386,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -16422,7 +16422,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } { if (temp2) @@ -16466,7 +16466,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } { if (temp2) diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py index 48ae5a0f97..e73b2e983b 100644 --- a/wxPython/src/mac/html.py +++ b/wxPython/src/mac/html.py @@ -2043,7 +2043,6 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) - def Destroy(self): pass class HtmlHelpControllerPtr(HtmlHelpController): def __init__(self, this): diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index a295edf486..6eef6a02b6 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1701,7 +1702,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1874,31 +1875,30 @@ SWIGINTERNINLINE PyObject* } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1970,7 +1970,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2242,7 +2242,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2522,7 +2522,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2953,7 +2953,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2989,7 +2989,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -3340,7 +3340,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3424,7 +3424,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -11680,7 +11680,7 @@ static PyObject *_wrap_HtmlHelpWindow_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpWindow_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12154,7 +12154,7 @@ static PyObject *_wrap_HtmlHelpWindow_GetToolBar(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12636,7 +12636,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetController(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12912,7 +12912,7 @@ static PyObject *_wrap_HtmlHelpDialog_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpDialog_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpDialog, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); diff --git a/wxPython/src/mac/media_wrap.cpp b/wxPython/src/mac/media_wrap.cpp index f635d0a9e6..8c59fb530e 100644 --- a/wxPython/src/mac/media_wrap.cpp +++ b/wxPython/src/mac/media_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1664,7 +1665,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1757,7 +1758,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/src/mac/webkit_wrap.cpp b/wxPython/src/mac/webkit_wrap.cpp index 4d75ad27f3..9ad142564b 100644 --- a/wxPython/src/mac/webkit_wrap.cpp +++ b/wxPython/src/mac/webkit_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1654,7 +1655,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp index 601632ba30..6b216b1cf0 100644 --- a/wxPython/src/mac/wizard_wrap.cpp +++ b/wxPython/src/mac/wizard_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1651,7 +1652,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1845,31 +1846,30 @@ static bool wxPyWizardPage_Create(wxPyWizardPage *self,wxWizard *parent,wxBitmap return self->Create(parent, bitmap, res); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1996,7 +1996,7 @@ static PyObject *_wrap_WizardEvent_GetPage(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2095,7 +2095,7 @@ static PyObject *_wrap_WizardPage_GetPrev(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2123,7 +2123,7 @@ static PyObject *_wrap_WizardPage_GetNext(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3455,7 +3455,7 @@ static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3574,7 +3574,7 @@ static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp index b4d721646d..8e381a0453 100644 --- a/wxPython/src/mac/xrc_wrap.cpp +++ b/wxPython/src/mac/xrc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1607,7 +1608,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2562,7 +2563,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2610,7 +2611,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2710,7 +2711,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2810,7 +2811,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2918,7 +2919,7 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -5366,7 +5367,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *, PyObject *a if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5507,7 +5508,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5535,7 +5536,7 @@ static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6668,7 +6669,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 9a8096b05c..dfd2a77d7f 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -2962,6 +2962,12 @@ def ToggleButton_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +BK_DEFAULT = _controls_.BK_DEFAULT +BK_TOP = _controls_.BK_TOP +BK_BOTTOM = _controls_.BK_BOTTOM +BK_LEFT = _controls_.BK_LEFT +BK_RIGHT = _controls_.BK_RIGHT +BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK class BookCtrlBase(_core.Control): """Proxy of C++ BookCtrlBase class""" def __init__(self): raise RuntimeError, "No constructor defined" @@ -3019,6 +3025,26 @@ class BookCtrlBase(_core.Control): """CalcSizeFromPage(self, Size sizePage) -> Size""" return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs) + def GetInternalBorder(*args, **kwargs): + """GetInternalBorder(self) -> unsigned int""" + return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs) + + def SetInternalBorder(*args, **kwargs): + """SetInternalBorder(self, unsigned int internalBorder)""" + return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs) + + def IsVertical(*args, **kwargs): + """IsVertical(self) -> bool""" + return _controls_.BookCtrlBase_IsVertical(*args, **kwargs) + + def SetShrinkMode(*args, **kwargs): + """SetShrinkMode(self, bool shrink)""" + return _controls_.BookCtrlBase_SetShrinkMode(*args, **kwargs) + + def GetShrinkMode(*args, **kwargs): + """GetShrinkMode(self) -> bool""" + return _controls_.BookCtrlBase_GetShrinkMode(*args, **kwargs) + def DeletePage(*args, **kwargs): """DeletePage(self, size_t n) -> bool""" return _controls_.BookCtrlBase_DeletePage(*args, **kwargs) @@ -3336,10 +3362,6 @@ class Listbook(BookCtrlBase): """ return _controls_.Listbook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Listbook_IsVertical(*args, **kwargs) - def GetListView(*args, **kwargs): """GetListView(self) -> ListView""" return _controls_.Listbook_GetListView(*args, **kwargs) @@ -3412,10 +3434,6 @@ class Choicebook(BookCtrlBase): """ return _controls_.Choicebook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Choicebook_IsVertical(*args, **kwargs) - def GetChoiceCtrl(*args, **kwargs): """GetChoiceCtrl(self) -> Choice""" return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs) @@ -3466,6 +3484,193 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C #--------------------------------------------------------------------------- +class Treebook(BookCtrlBase): + """Proxy of C++ Treebook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Treebook + """ + newobj = _controls_.new_Treebook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> bool + """ + return _controls_.Treebook_Create(*args, **kwargs) + + def InsertPage(*args, **kwargs): + """ + InsertPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertPage(*args, **kwargs) + + def InsertSubPage(*args, **kwargs): + """ + InsertSubPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool + """ + return _controls_.Treebook_InsertSubPage(*args, **kwargs) + + def AddPage(*args, **kwargs): + """AddPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddPage(*args, **kwargs) + + def AddSubPage(*args, **kwargs): + """AddSubPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddSubPage(*args, **kwargs) + + def DeletePage(*args, **kwargs): + """DeletePage(self, size_t pos) -> bool""" + return _controls_.Treebook_DeletePage(*args, **kwargs) + + def IsNodeExpanded(*args, **kwargs): + """IsNodeExpanded(self, size_t pos) -> bool""" + return _controls_.Treebook_IsNodeExpanded(*args, **kwargs) + + def ExpandNode(*args, **kwargs): + """ExpandNode(self, size_t pos, bool expand=True) -> bool""" + return _controls_.Treebook_ExpandNode(*args, **kwargs) + + def CollapseNode(*args, **kwargs): + """CollapseNode(self, size_t pos) -> bool""" + return _controls_.Treebook_CollapseNode(*args, **kwargs) + + def GetPageParent(*args, **kwargs): + """GetPageParent(self, size_t pos) -> int""" + return _controls_.Treebook_GetPageParent(*args, **kwargs) + + def GetTreeCtrl(*args, **kwargs): + """GetTreeCtrl(self) -> wxTreeCtrl""" + return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + + +class TreebookPtr(Treebook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Treebook +_controls_.Treebook_swigregister(TreebookPtr) + +def PreTreebook(*args, **kwargs): + """PreTreebook() -> Treebook""" + val = _controls_.new_PreTreebook(*args, **kwargs) + val.thisown = 1 + return val + +class TreebookEvent(BookCtrlBaseEvent): + """Proxy of C++ TreebookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxTreebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> TreebookEvent + """ + newobj = _controls_.new_TreebookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class TreebookEventPtr(TreebookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = TreebookEvent +_controls_.TreebookEvent_swigregister(TreebookEventPtr) + +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING +wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED +wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED +EVT_TREEBOOK_PAGE_CHANGED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, 1 ) +EVT_TREEBOOK_PAGE_CHANGING= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, 1) +EVT_TREEBOOK_NODE_COLLAPSED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 1 ) +EVT_TREEBOOK_NODE_EXPANDED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, 1 ) + +#--------------------------------------------------------------------------- + +class Toolbook(BookCtrlBase): + """Proxy of C++ Toolbook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Toolbook + """ + newobj = _controls_.new_Toolbook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, String name=wxEmptyString) -> bool + """ + return _controls_.Toolbook_Create(*args, **kwargs) + + def GetToolBar(*args, **kwargs): + """GetToolBar(self) -> ToolBarBase""" + return _controls_.Toolbook_GetToolBar(*args, **kwargs) + + def Realize(*args, **kwargs): + """Realize(self)""" + return _controls_.Toolbook_Realize(*args, **kwargs) + + +class ToolbookPtr(Toolbook): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Toolbook +_controls_.Toolbook_swigregister(ToolbookPtr) + +def PreToolbook(*args, **kwargs): + """PreToolbook() -> Toolbook""" + val = _controls_.new_PreToolbook(*args, **kwargs) + val.thisown = 1 + return val + +class ToolbookEvent(BookCtrlBaseEvent): + """Proxy of C++ ToolbookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> ToolbookEvent + """ + newobj = _controls_.new_ToolbookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class ToolbookEventPtr(ToolbookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = ToolbookEvent +_controls_.ToolbookEvent_swigregister(ToolbookEventPtr) + +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING +EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 1) +EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 1) + #--------------------------------------------------------------------------- TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON @@ -4101,6 +4306,12 @@ class ListItemAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_ListItemAttr): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTextColour(*args, **kwargs): """SetTextColour(self, Colour colText)""" return _controls_.ListItemAttr_SetTextColour(*args, **kwargs) @@ -4137,9 +4348,15 @@ class ListItemAttr(object): """GetFont(self) -> Font""" return _controls_.ListItemAttr_GetFont(*args, **kwargs) + def AssignFrom(*args, **kwargs): + """AssignFrom(self, ListItemAttr source)""" + return _controls_.ListItemAttr_AssignFrom(*args, **kwargs) + def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.ListItemAttr_Destroy(*args, **kwargs) + val = _controls_.ListItemAttr_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ListItemAttrPtr(ListItemAttr): @@ -5054,6 +5271,12 @@ class TreeItemData(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_TreeItemData): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetData(*args, **kwargs): """GetData(self) -> PyObject""" return _controls_.TreeItemData_GetData(*args, **kwargs) @@ -5072,7 +5295,9 @@ class TreeItemData(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.TreeItemData_Destroy(*args, **kwargs) + val = _controls_.TreeItemData_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class TreeItemDataPtr(TreeItemData): @@ -6191,7 +6416,9 @@ class HelpProvider(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.HelpProvider_Destroy(*args, **kwargs) + val = _controls_.HelpProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class HelpProviderPtr(HelpProvider): diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index a47bfad5cc..2024e9ff67 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1580,20 +1581,25 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #define SWIGTYPE_p_wxToolBar swig_types[146] #define SWIGTYPE_p_wxToolBarBase swig_types[147] #define SWIGTYPE_p_wxToolBarToolBase swig_types[148] -#define SWIGTYPE_p_wxTreeEvent swig_types[149] -#define SWIGTYPE_p_wxTreeItemId swig_types[150] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] -#define SWIGTYPE_p_wxValidator swig_types[152] -#define SWIGTYPE_p_wxVisualAttributes swig_types[153] -#define SWIGTYPE_p_wxWindow swig_types[154] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[155] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] -#define SWIGTYPE_p_wxXPMHandler swig_types[157] -#define SWIGTYPE_ptrdiff_t swig_types[158] -#define SWIGTYPE_std__ptrdiff_t swig_types[159] -#define SWIGTYPE_unsigned_int swig_types[160] -static swig_type_info *swig_types[162]; -static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxToolbook swig_types[149] +#define SWIGTYPE_p_wxToolbookEvent swig_types[150] +#define SWIGTYPE_p_wxTreeCtrl swig_types[151] +#define SWIGTYPE_p_wxTreeEvent swig_types[152] +#define SWIGTYPE_p_wxTreeItemId swig_types[153] +#define SWIGTYPE_p_wxTreebook swig_types[154] +#define SWIGTYPE_p_wxTreebookEvent swig_types[155] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[156] +#define SWIGTYPE_p_wxValidator swig_types[157] +#define SWIGTYPE_p_wxVisualAttributes swig_types[158] +#define SWIGTYPE_p_wxWindow swig_types[159] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[160] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[161] +#define SWIGTYPE_p_wxXPMHandler swig_types[162] +#define SWIGTYPE_ptrdiff_t swig_types[163] +#define SWIGTYPE_std__ptrdiff_t swig_types[164] +#define SWIGTYPE_unsigned_int swig_types[165] +static swig_type_info *swig_types[167]; +static swig_module_info swig_module = {swig_types, 166, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -1618,7 +1624,7 @@ static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0}; static const wxString wxPyButtonNameStr(wxButtonNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1657,7 +1663,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1784,36 +1790,35 @@ SWIG_Check_bool(PyObject* obj) static const wxString wxPyChoiceNameStr(wxChoiceNameStr); static const wxString wxPyComboBoxNameStr(wxComboBoxNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static const wxString wxPyGaugeNameStr(wxGaugeNameStr); @@ -1833,14 +1838,14 @@ static void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObje self->Insert(item, pos); } static PyObject *wxListBox_GetSelections(wxListBox *self){ - wxArrayInt lst; - self->GetSelections(lst); - PyObject *tup = PyTuple_New(lst.GetCount()); - for(size_t i=0; iGetSelections(lst); + PyObject *tup = PyTuple_New(lst.GetCount()); + for(size_t i=0; iGetWindowStyle() & wxLB_OWNERDRAW) @@ -1866,7 +1871,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1940,6 +1945,83 @@ SWIGINTERNINLINE PyObject* : PyInt_FromLong(static_cast(value)); } + +#if UINT_MAX < LONG_MAX +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_long +/*@@*/ +#else +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long +/*@@*/ +#endif + + +SWIGINTERNINLINE int + SWIG_CheckUnsignedLongInRange(unsigned long value, + unsigned long max_value, + const char *errmsg) +{ + if (value > max_value) { + if (errmsg) { + PyErr_Format(PyExc_OverflowError, + "value %lu is greater than '%s' minimum %lu", + value, errmsg, max_value); + } + return 0; + } + return 1; + } + + +#if UINT_MAX != ULONG_MAX +SWIGINTERN int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + const char* errmsg = val ? "unsigned int" : (char*)0; + unsigned long v; + if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { + if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { + if (val) *val = static_cast(v); + return 1; + } + } else { + PyErr_Clear(); + } + if (val) { + SWIG_type_error(errmsg, obj); + } + return 0; +} +#else +SWIGINTERNINLINE unsigned int + SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) +{ + return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); +} +#endif + + +SWIGINTERNINLINE unsigned int +SWIG_As_unsigned_SS_int(PyObject* obj) +{ + unsigned int v; + if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { + /* + this is needed to make valgrind/purify happier. + */ + memset((void*)&v, 0, sizeof(unsigned int)); + } + return v; +} + + +SWIGINTERNINLINE int +SWIG_Check_unsigned_SS_int(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); +} + static const wxString wxPyToolBarNameStr(wxToolBarNameStr); static PyObject *wxToolBarToolBase_GetClientData(wxToolBarToolBase *self){ wxPyUserData* udata = (wxPyUserData*)self->GetClientData(); @@ -2031,6 +2113,7 @@ public: // use the virtual version to avoid a confusing assert in the base class DEC_PYCALLBACK_INT_LONG_virtual(OnGetItemImage); + DEC_PYCALLBACK_INT_LONGLONG(OnGetItemColumnImage); PYPRIVATE; }; @@ -2040,7 +2123,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl); IMP_PYCALLBACK_STRING_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemText); IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr); IMP_PYCALLBACK_INT_LONG_virtual(wxPyListCtrl, wxListCtrl, OnGetItemImage); - +IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage); + static wxListItem *wxPyListCtrl_GetColumn(wxPyListCtrl *self,int col){ wxListItem item; @@ -2142,83 +2226,6 @@ public: IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); - -#if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_long -/*@@*/ -#else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ -#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long -/*@@*/ -#endif - - -SWIGINTERNINLINE int - SWIG_CheckUnsignedLongInRange(unsigned long value, - unsigned long max_value, - const char *errmsg) -{ - if (value > max_value) { - if (errmsg) { - PyErr_Format(PyExc_OverflowError, - "value %lu is greater than '%s' minimum %lu", - value, errmsg, max_value); - } - return 0; - } - return 1; - } - - -#if UINT_MAX != ULONG_MAX -SWIGINTERN int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - const char* errmsg = val ? "unsigned int" : (char*)0; - unsigned long v; - if (SWIG_AsVal_unsigned_SS_long(obj, &v)) { - if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) { - if (val) *val = static_cast(v); - return 1; - } - } else { - PyErr_Clear(); - } - if (val) { - SWIG_type_error(errmsg, obj); - } - return 0; -} -#else -SWIGINTERNINLINE unsigned int - SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val) -{ - return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val); -} -#endif - - -SWIGINTERNINLINE unsigned int -SWIG_As_unsigned_SS_int(PyObject* obj) -{ - unsigned int v; - if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(unsigned int)); - } - return v; -} - - -SWIGINTERNINLINE int -SWIG_Check_unsigned_SS_int(PyObject* obj) -{ - return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0); -} - static wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){ wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item); if (data == NULL) { @@ -16660,7 +16667,7 @@ static PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -16811,6 +16818,152 @@ static PyObject *_wrap_BookCtrlBase_CalcSizeFromPage(PyObject *, PyObject *args, } +static PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetInternalBorder",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + unsigned int arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "internalBorder", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetInternalBorder",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInternalBorder(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_IsVertical",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->IsVertical(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_SetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "shrink", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetShrinkMode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetShrinkMode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_BookCtrlBase_GetShrinkMode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlBase_GetShrinkMode",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlBase, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxBookCtrlBase const *)arg1)->GetShrinkMode(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; @@ -18016,21 +18169,781 @@ static PyObject *_wrap_Listbook_Create(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListbook *arg1 = (wxListbook *) 0 ; + wxListView *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListView *)(arg1)->GetListView(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxListbookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) 0 ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxChoicebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebook *)new wxChoicebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxChoice *result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxChoicebook *arg1 = (wxChoicebook *) 0 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeleteAllPages(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + int arg3 = (int) -1 ; + int arg4 = (int) -1 ; + wxChoicebookEvent *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if (obj0) { + { + arg1 = static_cast(SWIG_As_int(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_int(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Treebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxWindow *arg1 = (wxWindow *) 0 ; + int arg2 ; + wxPoint const &arg3_defvalue = wxDefaultPosition ; + wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; + wxSize const &arg4_defvalue = wxDefaultSize ; + wxSize *arg4 = (wxSize *) &arg4_defvalue ; + long arg5 = (long) wxBK_DEFAULT ; + wxString const &arg6_defvalue = wxPyEmptyString ; + wxString *arg6 = (wxString *) &arg6_defvalue ; + wxTreebook *result; + wxPoint temp3 ; + wxSize temp4 ; + bool temp6 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Treebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = &temp3; + if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail; + } + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxSize_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_long(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = wxString_in_helper(obj5); + if (arg6 == NULL) SWIG_fail; + temp6 = true; + } + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + { + if (temp6) + delete arg6; + } + return resultobj; + fail: + { + if (temp6) + delete arg6; + } + return NULL; +} + + +static PyObject *_wrap_new_PreTreebook(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreTreebook",kwnames)) goto fail; + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxTreebook *)new wxTreebook(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebook, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + int arg3 ; + wxPoint const &arg4_defvalue = wxDefaultPosition ; + wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; + wxSize const &arg5_defvalue = wxDefaultSize ; + wxSize *arg5 = (wxSize *) &arg5_defvalue ; + long arg6 = (long) wxBK_DEFAULT ; + wxString const &arg7_defvalue = wxPyEmptyString ; + wxString *arg7 = (wxString *) &arg7_defvalue ; + bool result; + wxPoint temp4 ; + wxSize temp5 ; + bool temp7 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Treebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = static_cast(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = &temp4; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = &temp5; + if ( ! wxSize_helper(obj4, &arg5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_long(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + if (obj6) { + { + arg7 = wxString_in_helper(obj6); + if (arg7 == NULL) SWIG_fail; + temp7 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp7) + delete arg7; + } + return resultobj; + fail: + { + if (temp7) + delete arg7; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->InsertPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_InsertSubPage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 = (bool) false ; + int arg6 = (int) wxNOT_FOUND ; + bool result; + bool temp4 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Treebook_InsertSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(3)) SWIG_fail; + { + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_bool(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + if (obj5) { + { + arg6 = static_cast(SWIG_As_int(obj5)); + if (SWIG_arg_fail(6)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,arg3,(wxString const &)*arg4,arg5,arg6); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp4) + delete arg4; + } + return resultobj; + fail: + { + if (temp4) + delete arg4; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_AddPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; bool result; + bool temp3 = false ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxListbook const *)arg1)->IsVertical(); + result = (bool)(arg1)->AddPage(arg2,(wxString const &)*arg3,arg4,arg5); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18038,52 +18951,302 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject { resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); } + { + if (temp3) + delete arg3; + } return resultobj; fail: + { + if (temp3) + delete arg3; + } return NULL; } -static PyObject *_wrap_Listbook_GetListView(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Treebook_AddSubPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxListbook *arg1 = (wxListbook *) 0 ; - wxListView *result; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxString *arg3 = 0 ; + bool arg4 = (bool) false ; + int arg5 = (int) wxNOT_FOUND ; + bool result; + bool temp3 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "page",(char *) "text",(char *) "select",(char *) "imageId", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Treebook_AddSubPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; + } + if (obj3) { + { + arg4 = static_cast(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + if (obj4) { + { + arg5 = static_cast(SWIG_As_int(obj4)); + if (SWIG_arg_fail(5)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->AddSubPage(arg2,(wxString const &)*arg3,arg4,arg5); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp3) + delete arg3; + } + return resultobj; + fail: + { + if (temp3) + delete arg3; + } + return NULL; +} + + +static PyObject *_wrap_Treebook_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_DeletePage",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->DeletePage(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_IsNodeExpanded(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_IsNodeExpanded",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxTreebook const *)arg1)->IsNodeExpanded(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_ExpandNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool arg3 = (bool) true ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos",(char *) "expand", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Treebook_ExpandNode",kwnames,&obj0,&obj1,&obj2)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (obj2) { + { + arg3 = static_cast(SWIG_As_bool(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->ExpandNode(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_CollapseNode(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_CollapseNode",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->CollapseNode(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetPageParent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + size_t arg2 ; + int result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Treebook_GetPageParent",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxTreebook const *)arg1)->GetPageParent(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_int(static_cast(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Treebook_GetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxTreebook *arg1 = (wxTreebook *) 0 ; + wxTreeCtrl *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Listbook_GetListView",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListbook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Treebook_GetTreeCtrl",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxTreebook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListView *)(arg1)->GetListView(); + result = (wxTreeCtrl *)((wxTreebook const *)arg1)->GetTreeCtrl(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListView, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreeCtrl, 0); return resultobj; fail: return NULL; } -static PyObject * Listbook_swigregister(PyObject *, PyObject *args) { +static PyObject * Treebook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_TreebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxListbookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxTreebookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18092,7 +19255,7 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TreebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -18119,26 +19282,26 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListbookEvent *)new wxListbookEvent(arg1,arg2,arg3,arg4); + result = (wxTreebookEvent *)new wxTreebookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListbookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTreebookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * TreebookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxTreebookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Toolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; int arg2 ; @@ -18146,10 +19309,10 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - long arg5 = (long) 0 ; + long arg5 = (long) wxBK_DEFAULT ; wxString const &arg6_defvalue = wxPyEmptyString ; wxString *arg6 = (wxString *) &arg6_defvalue ; - wxChoicebook *result; + wxToolbook *result; wxPoint temp3 ; wxSize temp4 ; bool temp6 = false ; @@ -18163,7 +19326,7 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar (char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Choicebook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:new_Toolbook",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -18196,14 +19359,13 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } } { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); + result = (wxToolbook *)new wxToolbook(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,(wxString const &)*arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); { if (temp6) delete arg6; @@ -18218,32 +19380,31 @@ static PyObject *_wrap_new_Choicebook(PyObject *, PyObject *args, PyObject *kwar } -static PyObject *_wrap_new_PreChoicebook(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PreToolbook(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *result; + wxToolbook *result; char *kwnames[] = { NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreChoicebook",kwnames)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PreToolbook",kwnames)) goto fail; { - if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebook *)new wxChoicebook(); + result = (wxToolbook *)new wxToolbook(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebook, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbook, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Create(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; + wxToolbook *arg1 = (wxToolbook *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; int arg3 ; wxPoint const &arg4_defvalue = wxDefaultPosition ; @@ -18251,7 +19412,7 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; long arg6 = (long) 0 ; - wxString const &arg7_defvalue = wxPyEmptyString ; + wxString const &arg7_defvalue = wxEmptyString ; wxString *arg7 = (wxString *) &arg7_defvalue ; bool result; wxPoint temp4 ; @@ -18268,8 +19429,8 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k (char *) "self",(char *) "parent",(char *) "id",(char *) "pos",(char *) "size",(char *) "style",(char *) "name", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Choicebook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Toolbook_Create",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(2)) SWIG_fail; @@ -18326,102 +19487,73 @@ static PyObject *_wrap_Choicebook_Create(PyObject *, PyObject *args, PyObject *k } -static PyObject *_wrap_Choicebook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; + wxToolBarBase *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_IsVertical",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_GetToolBar",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxChoicebook const *)arg1)->IsVertical(); + result = (wxToolBarBase *)((wxToolbook const *)arg1)->GetToolBar(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Choicebook_GetChoiceCtrl(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - wxChoice *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_GetChoiceCtrl",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoice *)((wxChoicebook const *)arg1)->GetChoiceCtrl(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; + resultobj = wxPyMake_wxObject(result, (bool)0); } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoice, 0); return resultobj; fail: return NULL; } -static PyObject *_wrap_Choicebook_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Toolbook_Realize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; - wxChoicebook *arg1 = (wxChoicebook *) 0 ; - bool result; + wxToolbook *arg1 = (wxToolbook *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Choicebook_DeleteAllPages",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxChoicebook, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Toolbook_Realize",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolbook, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->DeleteAllPages(); + (arg1)->Realize(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject * Choicebook_swigregister(PyObject *, PyObject *args) { +static PyObject * Toolbook_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebook, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbook, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_ToolbookEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxEventType arg1 = (wxEventType) wxEVT_NULL ; int arg2 = (int) 0 ; - int arg3 = (int) -1 ; - int arg4 = (int) -1 ; - wxChoicebookEvent *result; + int arg3 = (int) wxNOT_FOUND ; + int arg4 = (int) wxNOT_FOUND ; + wxToolbookEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -18430,7 +19562,7 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject (char *) "commandType",(char *) "id",(char *) "nSel",(char *) "nOldSel", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ChoicebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ToolbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; if (obj0) { { arg1 = static_cast(SWIG_As_int(obj0)); @@ -18457,22 +19589,22 @@ static PyObject *_wrap_new_ChoicebookEvent(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoicebookEvent *)new wxChoicebookEvent(arg1,arg2,arg3,arg4); + result = (wxToolbookEvent *)new wxToolbookEvent(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxChoicebookEvent, 1); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolbookEvent, 1); return resultobj; fail: return NULL; } -static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { +static PyObject * ToolbookEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxChoicebookEvent, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxToolbookEvent, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -18552,7 +19684,7 @@ static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19471,7 +20603,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -19601,7 +20733,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -19657,7 +20789,7 @@ static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19695,7 +20827,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19727,7 +20859,7 @@ static PyObject *_wrap_ToolBarBase_AddControl(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19765,7 +20897,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19827,7 +20959,7 @@ static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19861,7 +20993,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -19895,7 +21027,7 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20968,7 +22100,7 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21002,7 +22134,7 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21269,7 +22401,7 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -21394,6 +22526,31 @@ static PyObject *_wrap_new_ListItemAttr(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_ListItemAttr(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ListItemAttr",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21667,6 +22824,41 @@ static PyObject *_wrap_ListItemAttr_GetFont(PyObject *, PyObject *args, PyObject } +static PyObject *_wrap_ListItemAttr_AssignFrom(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; + wxListItemAttr *arg2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "source", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItemAttr_AssignFrom",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxListItemAttr, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(2)) SWIG_fail; + if (arg2 == NULL) { + SWIG_null_ref("wxListItemAttr"); + } + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->AssignFrom((wxListItemAttr const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ListItemAttr_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxListItemAttr *arg1 = (wxListItemAttr *) 0 ; @@ -21715,7 +22907,7 @@ static PyObject *_wrap_new_ListItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -23423,7 +24615,7 @@ static PyObject *_wrap_ListEvent_m_item_get(PyObject *, PyObject *args, PyObject result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24195,7 +25387,7 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24441,7 +25633,7 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -25315,7 +26507,7 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -27417,6 +28609,31 @@ static PyObject *_wrap_new_TreeItemData(PyObject *, PyObject *args, PyObject *kw } +static PyObject *_wrap_delete_TreeItemData(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TreeItemData",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TreeItemData_GetData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ; @@ -28519,7 +29736,7 @@ static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -28547,7 +29764,7 @@ static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -29074,7 +30291,7 @@ static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *, PyObject *args, PyObject } if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -30096,7 +31313,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *, PyObject *args, PyObject *kw } } if (obj4) { - SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj4, (void **)&arg5, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(5)) SWIG_fail; } { @@ -30174,7 +31391,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -30262,7 +31479,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *, PyObject *args, PyObject } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30346,7 +31563,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *, PyObject *args, PyO } } if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -30424,7 +31641,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *, PyObject *args, PyObject } } if (obj5) { - SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj5, (void **)&arg6, SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -33787,7 +35004,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HelpProvider_Set",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -33796,7 +35013,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHelpProvider, 1); return resultobj; fail: return NULL; @@ -35568,6 +36785,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"BookCtrlBase_SetPageImage", (PyCFunction) _wrap_BookCtrlBase_SetPageImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_SetPageSize", (PyCFunction) _wrap_BookCtrlBase_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_CalcSizeFromPage", (PyCFunction) _wrap_BookCtrlBase_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_GetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_IsVertical", (PyCFunction) _wrap_BookCtrlBase_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_SetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_SetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BookCtrlBase_GetShrinkMode", (PyCFunction) _wrap_BookCtrlBase_GetShrinkMode, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction) _wrap_BookCtrlBase_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35599,7 +36821,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Listbook", (PyCFunction) _wrap_new_Listbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreListbook", (PyCFunction) _wrap_new_PreListbook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_Create", (PyCFunction) _wrap_Listbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Listbook_IsVertical", (PyCFunction) _wrap_Listbook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_GetListView", (PyCFunction) _wrap_Listbook_GetListView, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Listbook_swigregister", Listbook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListbookEvent", (PyCFunction) _wrap_new_ListbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35607,12 +36828,35 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_Choicebook", (PyCFunction) _wrap_new_Choicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreChoicebook", (PyCFunction) _wrap_new_PreChoicebook, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_Create", (PyCFunction) _wrap_Choicebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Choicebook_IsVertical", (PyCFunction) _wrap_Choicebook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_GetChoiceCtrl", (PyCFunction) _wrap_Choicebook_GetChoiceCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_DeleteAllPages", (PyCFunction) _wrap_Choicebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Choicebook_swigregister", Choicebook_swigregister, METH_VARARGS, NULL}, { (char *)"new_ChoicebookEvent", (PyCFunction) _wrap_new_ChoicebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ChoicebookEvent_swigregister", ChoicebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Treebook", (PyCFunction) _wrap_new_Treebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreTreebook", (PyCFunction) _wrap_new_PreTreebook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_Create", (PyCFunction) _wrap_Treebook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertPage", (PyCFunction) _wrap_Treebook_InsertPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_InsertSubPage", (PyCFunction) _wrap_Treebook_InsertSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddPage", (PyCFunction) _wrap_Treebook_AddPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_AddSubPage", (PyCFunction) _wrap_Treebook_AddSubPage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_DeletePage", (PyCFunction) _wrap_Treebook_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_IsNodeExpanded", (PyCFunction) _wrap_Treebook_IsNodeExpanded, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_ExpandNode", (PyCFunction) _wrap_Treebook_ExpandNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_CollapseNode", (PyCFunction) _wrap_Treebook_CollapseNode, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetPageParent", (PyCFunction) _wrap_Treebook_GetPageParent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_GetTreeCtrl", (PyCFunction) _wrap_Treebook_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Treebook_swigregister", Treebook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_TreebookEvent", (PyCFunction) _wrap_new_TreebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"TreebookEvent_swigregister", TreebookEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Toolbook", (PyCFunction) _wrap_new_Toolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_PreToolbook", (PyCFunction) _wrap_new_PreToolbook, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Create", (PyCFunction) _wrap_Toolbook_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_GetToolBar", (PyCFunction) _wrap_Toolbook_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_Realize", (PyCFunction) _wrap_Toolbook_Realize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Toolbook_swigregister", Toolbook_swigregister, METH_VARARGS, NULL}, + { (char *)"new_ToolbookEvent", (PyCFunction) _wrap_new_ToolbookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ToolbookEvent_swigregister", ToolbookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"ToolBarToolBase_GetId", (PyCFunction) _wrap_ToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetControl", (PyCFunction) _wrap_ToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBarToolBase_GetToolBar", (PyCFunction) _wrap_ToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35695,6 +36939,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItemAttr", (PyCFunction) _wrap_new_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ListItemAttr", (PyCFunction) _wrap_delete_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetTextColour", (PyCFunction) _wrap_ListItemAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_SetFont", (PyCFunction) _wrap_ListItemAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35704,6 +36949,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ListItemAttr_GetTextColour", (PyCFunction) _wrap_ListItemAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_GetFont", (PyCFunction) _wrap_ListItemAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ListItemAttr_AssignFrom", (PyCFunction) _wrap_ListItemAttr_AssignFrom, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_Destroy", (PyCFunction) _wrap_ListItemAttr_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ListItemAttr_swigregister", ListItemAttr_swigregister, METH_VARARGS, NULL}, { (char *)"new_ListItem", (PyCFunction) _wrap_new_ListItem, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35880,6 +37126,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TreeItemId_m_pItem_get", (PyCFunction) _wrap_TreeItemId_m_pItem_get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemId_swigregister", TreeItemId_swigregister, METH_VARARGS, NULL}, { (char *)"new_TreeItemData", (PyCFunction) _wrap_new_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TreeItemData", (PyCFunction) _wrap_delete_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetData", (PyCFunction) _wrap_TreeItemData_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_SetData", (PyCFunction) _wrap_TreeItemData_SetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TreeItemData_GetId", (PyCFunction) _wrap_TreeItemData_GetId, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -36146,6 +37393,12 @@ static void *_p_wxListbookEventTo_p_wxEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -36263,8 +37516,8 @@ static void *_p_wxToggleButtonTo_p_wxControl(void *x) { static void *_p_wxRadioButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxRadioButton *) x)); } -static void *_p_wxPyControlTo_p_wxControl(void *x) { - return (void *)((wxControl *) ((wxPyControl *) x)); +static void *_p_wxToolbookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxToolbook *) x)); } static void *_p_wxToolBarBaseTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxToolBarBase *) x)); @@ -36278,6 +37531,9 @@ static void *_p_wxPyListCtrlTo_p_wxControl(void *x) { static void *_p_wxComboBoxTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxControlWithItems *)(wxChoice *) ((wxComboBox *) x)); } +static void *_p_wxPyControlTo_p_wxControl(void *x) { + return (void *)((wxControl *) ((wxPyControl *) x)); +} static void *_p_wxGenericDirCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxGenericDirCtrl *) x)); } @@ -36338,8 +37594,8 @@ static void *_p_wxStaticBoxTo_p_wxControl(void *x) { static void *_p_wxSliderTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSlider *) x)); } -static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { - return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +static void *_p_wxTreebookTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxBookCtrlBase *) ((wxTreebook *) x)); } static void *_p_wxSpinButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxSpinButton *) x)); @@ -36350,6 +37606,9 @@ static void *_p_wxButtonTo_p_wxControl(void *x) { static void *_p_wxBitmapButtonTo_p_wxControl(void *x) { return (void *)((wxControl *) (wxButton *) ((wxBitmapButton *) x)); } +static void *_p_wxContextHelpButtonTo_p_wxControl(void *x) { + return (void *)((wxControl *) (wxButton *)(wxBitmapButton *) ((wxContextHelpButton *) x)); +} static void *_p_wxDatePickerCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxDatePickerCtrl *) x)); } @@ -36386,12 +37645,24 @@ static void *_p_wxListbookEventTo_p_wxNotifyEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxNotifyEvent(void *x) { return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) (wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxChoicebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxChoicebook *) x)); } static void *_p_wxListbookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxListbook *) x)); } +static void *_p_wxToolbookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxToolbook *) x)); +} +static void *_p_wxTreebookTo_p_wxBookCtrlBase(void *x) { + return (void *)((wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxNotebookTo_p_wxBookCtrlBase(void *x) { return (void *)((wxBookCtrlBase *) ((wxNotebook *) x)); } @@ -36419,18 +37690,21 @@ static void *_p_wxToggleButtonTo_p_wxEvtHandler(void *x) { static void *_p_wxRadioButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) ((wxWindow *) x)); } static void *_p_wxControlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); } -static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); -} static void *_p_wxComboBoxTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxControlWithItems *)(wxChoice *) ((wxComboBox *) x)); } +static void *_p_wxToolBarBaseTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxToolBarBase *) x)); +} static void *_p_wxPyListCtrlTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxPyListCtrl *) x)); } @@ -36503,6 +37777,9 @@ static void *_p_wxStaticBoxTo_p_wxEvtHandler(void *x) { static void *_p_wxSliderTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxEvtHandler(void *x) { return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxSpinButton *) x)); } @@ -36539,6 +37816,9 @@ static void *_p_wxSimpleHelpProviderTo_p_wxHelpProvider(void *x) { static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } +static void *_p_wxToolbookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxGBSizerItemTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizerItem *) ((wxGBSizerItem *) x)); } @@ -36647,6 +37927,9 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { static void *_p_wxPySizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxPySizer *) x)); } +static void *_p_wxTreebookTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxListViewTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *)(wxPyListCtrl *) ((wxListView *) x)); } @@ -36824,6 +38107,12 @@ static void *_p_wxListbookEventTo_p_wxObject(void *x) { static void *_p_wxChoicebookEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -36920,21 +38209,24 @@ static void *_p_wxToggleButtonTo_p_wxWindow(void *x) { static void *_p_wxRadioButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxRadioButton *) x)); } +static void *_p_wxToolbookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxToolbook *) x)); +} static void *_p_wxControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxControl *) x)); } static void *_p_wxToolBarBaseTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxToolBarBase *) x)); } -static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); -} static void *_p_wxPyListCtrlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyListCtrl *) x)); } static void *_p_wxComboBoxTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxComboBox *) x)); } +static void *_p_wxDirFilterListCtrlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxControlWithItems *)(wxChoice *) ((wxDirFilterListCtrl *) x)); +} static void *_p_wxPyControlTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxPyControl *) x)); } @@ -36998,6 +38290,9 @@ static void *_p_wxStaticBoxTo_p_wxWindow(void *x) { static void *_p_wxSliderTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSlider *) x)); } +static void *_p_wxTreebookTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *)(wxBookCtrlBase *) ((wxTreebook *) x)); +} static void *_p_wxSpinButtonTo_p_wxWindow(void *x) { return (void *)((wxWindow *) (wxControl *) ((wxSpinButton *) x)); } @@ -37025,6 +38320,12 @@ static void *_p_wxListbookEventTo_p_wxBookCtrlBaseEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent(void *x) { return (void *)((wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxBookCtrlBaseEvent(void *x) { + return (void *)((wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxWindowDestroyEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxWindowDestroyEvent *) x)); } @@ -37052,6 +38353,12 @@ static void *_p_wxNotebookEventTo_p_wxCommandEvent(void *x) { static void *_p_wxChoicebookEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxChoicebookEvent *) x)); } +static void *_p_wxTreebookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxTreebookEvent *) x)); +} +static void *_p_wxToolbookEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *)(wxBookCtrlBaseEvent *) ((wxToolbookEvent *) x)); +} static void *_p_wxDateEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxDateEvent *) x)); } @@ -37155,9 +38462,9 @@ static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMoveEvent = {"_p_wxMoveEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPaintEvent = {"_p_wxPaintEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxNcPaintEvent = {"_p_wxNcPaintEvent", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDisplayChangedEvent = {"_p_wxDisplayChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMouseCaptureChangedEvent = {"_p_wxMouseCaptureChangedEvent", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxPaletteChangedEvent = {"_p_wxPaletteChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSysColourChangedEvent = {"_p_wxSysColourChangedEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDropFilesEvent = {"_p_wxDropFilesEvent", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxFocusEvent = {"_p_wxFocusEvent", 0, 0, 0, 0}; @@ -37205,8 +38512,6 @@ static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0 static swig_type_info _swigt__p_wxFSFile = {"_p_wxFSFile", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPySizer = {"_p_wxPySizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyImageHandler = {"_p_wxPyImageHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxBMPHandler = {"_p_wxBMPHandler", 0, 0, 0, 0}; @@ -37218,6 +38523,8 @@ static swig_type_info _swigt__p_wxGIFHandler = {"_p_wxGIFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImage = {"_p_wxImage", 0, 0, 0, 0}; @@ -37250,8 +38557,13 @@ static swig_type_info _swigt__p_wxToggleButton = {"_p_wxToggleButton", "wxToggle static swig_type_info _swigt__p_wxToolBar = {"_p_wxToolBar", "wxToolBar *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", "wxToolBarBase *", 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", "wxToolBarToolBase *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", "wxToolbook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxToolbookEvent = {"_p_wxToolbookEvent", "wxToolbookEvent *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreeCtrl = {"_p_wxTreeCtrl", "wxTreeCtrl *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeEvent = {"_p_wxTreeEvent", "wxTreeEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxTreeItemId = {"_p_wxTreeItemId", "wxTreeItemId *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebook = {"_p_wxTreebook", "wxTreebook *", 0, 0, 0}; +static swig_type_info _swigt__p_wxTreebookEvent = {"_p_wxTreebookEvent", "wxTreebookEvent *", 0, 0, 0}; static swig_type_info _swigt__p_wxValidator = {"_p_wxValidator", "wxValidator *", 0, 0, 0}; static swig_type_info _swigt__p_wxVisualAttributes = {"_p_wxVisualAttributes", "wxVisualAttributes *", 0, 0, 0}; static swig_type_info _swigt__p_wxWindow = {"_p_wxWindow", "wxWindow *", 0, 0, 0}; @@ -37409,8 +38721,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxToolBar, &_swigt__p_wxToolBarBase, &_swigt__p_wxToolBarToolBase, + &_swigt__p_wxToolbook, + &_swigt__p_wxToolbookEvent, + &_swigt__p_wxTreeCtrl, &_swigt__p_wxTreeEvent, &_swigt__p_wxTreeItemId, + &_swigt__p_wxTreebook, + &_swigt__p_wxTreebookEvent, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, &_swigt__p_wxVisualAttributes, @@ -37436,8 +38753,8 @@ static swig_cast_info _swigc__p_wxArrayInt[] = { {&_swigt__p_wxArrayInt, 0, 0, static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmapButton[] = { {&_swigt__p_wxBitmapButton, 0, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxBitmapButton, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBase[] = { {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxBookCtrlBase, 0, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxBookCtrlBase, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxBookCtrlBase, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxBookCtrlBaseEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, 0, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxBookCtrlBaseEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxBookCtrlBaseEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxButton[] = { {&_swigt__p_wxButton, 0, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxButton, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxButton, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckBox[] = { {&_swigt__p_wxCheckBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCheckListBox[] = { {&_swigt__p_wxCheckListBox, 0, 0, 0},{0, 0, 0, 0}}; @@ -37454,10 +38771,10 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxCommandEvent[] = { {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxCommandEvent, 0, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelp[] = { {&_swigt__p_wxContextHelp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxContextHelpButton[] = { {&_swigt__p_wxContextHelpButton, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxControl[] = { {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxControl, 0, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxControl, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxControl, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxControl, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxControl, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxControl, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControl, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxControl, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxControl, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxControl, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxControl, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxControl, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxControl, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxControl, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxControl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = { {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxControlWithItems, 0, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxControlWithItems, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxControlWithItems, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxCursor[] = { {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDC[] = { {&_swigt__p_wxDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -37480,21 +38797,21 @@ static swig_cast_info _swigc__p_wxSizeEvent[] = {{&_swigt__p_wxSizeEvent, 0, 0, static swig_cast_info _swigc__p_wxMoveEvent[] = {{&_swigt__p_wxMoveEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaintEvent[] = {{&_swigt__p_wxPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNcPaintEvent[] = {{&_swigt__p_wxNcPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDisplayChangedEvent[] = {{&_swigt__p_wxDisplayChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMouseCaptureChangedEvent[] = {{&_swigt__p_wxMouseCaptureChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPaletteChangedEvent[] = {{&_swigt__p_wxPaletteChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSysColourChangedEvent[] = {{&_swigt__p_wxSysColourChangedEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDropFilesEvent[] = {{&_swigt__p_wxDropFilesEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFocusEvent[] = {{&_swigt__p_wxFocusEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvent[] = { {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxEvent, 0, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxEvent, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxEvent, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuBar[] = {{&_swigt__p_wxMenuBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyApp[] = {{&_swigt__p_wxPyApp, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = {{&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEvtHandler[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxEvtHandler, 0, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxEvtHandler, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxEvtHandler, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFont[] = { {&_swigt__p_wxFont, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGauge[] = { {&_swigt__p_wxGauge, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = { {&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37516,7 +38833,7 @@ static swig_cast_info _swigc__p_wxMemoryDC[] = { {&_swigt__p_wxMemoryDC, 0, 0, static swig_cast_info _swigc__p_wxMouseEvent[] = { {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebook[] = { {&_swigt__p_wxNotebook, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNotebookEvent[] = { {&_swigt__p_wxNotebookEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxNotifyEvent[] = { {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxNotifyEvent, 0, 0}, {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}}; @@ -37530,8 +38847,6 @@ static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer static swig_cast_info _swigc__p_wxFSFile[] = {{&_swigt__p_wxFSFile, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPySizer[] = {{&_swigt__p_wxPySizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyImageHandler[] = {{&_swigt__p_wxPyImageHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBMPHandler[] = {{&_swigt__p_wxBMPHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -37543,11 +38858,13 @@ static swig_cast_info _swigc__p_wxGIFHandler[] = {{&_swigt__p_wxGIFHandler, 0, 0 static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImage[] = {{&_swigt__p_wxImage, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxFileSystem[] = {{&_swigt__p_wxFileSystem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyControl[] = { {&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; @@ -37576,11 +38893,16 @@ static swig_cast_info _swigc__p_wxToggleButton[] = { {&_swigt__p_wxToggleButton static swig_cast_info _swigc__p_wxToolBar[] = { {&_swigt__p_wxToolBar, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = { {&_swigt__p_wxToolBarBase, 0, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxToolBarBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarToolBase[] = { {&_swigt__p_wxToolBarToolBase, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbook[] = { {&_swigt__p_wxToolbook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxToolbookEvent[] = { {&_swigt__p_wxToolbookEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreeCtrl[] = { {&_swigt__p_wxTreeCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeEvent[] = { {&_swigt__p_wxTreeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTreeItemId[] = { {&_swigt__p_wxTreeItemId, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebook[] = { {&_swigt__p_wxTreebook, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTreebookEvent[] = { {&_swigt__p_wxTreebookEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = { {&_swigt__p_wxValidator, 0, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxValidator, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxVisualAttributes[] = { {&_swigt__p_wxVisualAttributes, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxWindow, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxWindow, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxWindow, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxWindow, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxWindow, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxWindow, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__ptrdiff_t[] = { {&_swigt__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__std__ptrdiff_t[] = { {&_swigt__std__ptrdiff_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__unsigned_int[] = { {&_swigt__unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; @@ -37735,8 +39057,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxToolBar, _swigc__p_wxToolBarBase, _swigc__p_wxToolBarToolBase, + _swigc__p_wxToolbook, + _swigc__p_wxToolbookEvent, + _swigc__p_wxTreeCtrl, _swigc__p_wxTreeEvent, _swigc__p_wxTreeItemId, + _swigc__p_wxTreebook, + _swigc__p_wxTreebookEvent, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, _swigc__p_wxVisualAttributes, @@ -38506,6 +39833,24 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NotebookNameStr",_wrap_NotebookNameStr_get, _wrap_NotebookNameStr_set); + { + PyDict_SetItemString(d,"BK_DEFAULT", SWIG_From_int(static_cast(wxBK_DEFAULT))); + } + { + PyDict_SetItemString(d,"BK_TOP", SWIG_From_int(static_cast(wxBK_TOP))); + } + { + PyDict_SetItemString(d,"BK_BOTTOM", SWIG_From_int(static_cast(wxBK_BOTTOM))); + } + { + PyDict_SetItemString(d,"BK_LEFT", SWIG_From_int(static_cast(wxBK_LEFT))); + } + { + PyDict_SetItemString(d,"BK_RIGHT", SWIG_From_int(static_cast(wxBK_RIGHT))); + } + { + PyDict_SetItemString(d,"BK_ALIGN_MASK", SWIG_From_int(static_cast(wxBK_ALIGN_MASK))); + } { PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_From_int(static_cast(wxNB_FIXEDWIDTH))); } @@ -38581,6 +39926,12 @@ SWIGEXPORT void SWIG_init(void) { } PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED", PyInt_FromLong(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING)); { PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_From_int(static_cast(wxTOOL_STYLE_BUTTON))); } diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index cc9ce79131..8a9960839a 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -708,7 +708,9 @@ class Object(object): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Object_Destroy(*args, **kwargs) + val = _core_.Object_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ObjectPtr(Object): @@ -2415,7 +2417,9 @@ class Image(Object): Destroys the image data. """ - return _core_.Image_Destroy(*args, **kwargs) + val = _core_.Image_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def Scale(*args, **kwargs): """ @@ -3596,7 +3600,9 @@ class EvtHandler(Object): def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self, bool incref=True)""" - return _core_.EvtHandler__setOORInfo(*args, **kwargs) + val = _core_.EvtHandler__setOORInfo(*args, **kwargs) + args[0].thisown = 0 + return val def Bind(self, event, handler, source=None, id=wx.ID_ANY, id2=wx.ID_ANY): """ @@ -8109,7 +8115,9 @@ class Window(EvtHandler): Returns True if the window has either been successfully deleted, or it has been added to the list of windows pending real deletion. """ - return _core_.Window_Destroy(*args, **kwargs) + val = _core_.Window_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyChildren(*args, **kwargs): """ @@ -10161,6 +10169,9 @@ class Window(EvtHandler): if hasattr(self, '_setCallbackInfo'): self._setCallbackInfo(self, self.__class__) + def SendSizeEvent(self): + self.GetEventhandler().ProcessEvent(wx.SizeEvent((-1,-1))) + class WindowPtr(Window): def __init__(self, this): @@ -10517,7 +10528,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_Destroy(*args, **kwargs) + val = _core_.Menu_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyId(*args, **kwargs): """ @@ -10525,7 +10538,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyId(*args, **kwargs) + val = _core_.Menu_DestroyId(*args, **kwargs) + args[0].thisown = 0 + return val def DestroyItem(*args, **kwargs): """ @@ -10533,7 +10548,9 @@ class Menu(EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _core_.Menu_DestroyItem(*args, **kwargs) + val = _core_.Menu_DestroyItem(*args, **kwargs) + args[0].thisown = 0 + return val def GetMenuItemCount(*args, **kwargs): """GetMenuItemCount(self) -> size_t""" @@ -11340,6 +11357,12 @@ class SizerItem(Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_SizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def DeleteWindows(*args, **kwargs): """ DeleteWindows(self) @@ -11685,6 +11708,12 @@ class Sizer(Object): def __init__(self): raise RuntimeError, "No constructor defined" def __repr__(self): return "<%s.%s; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __del__(self, destroy=_core_.delete_Sizer): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setOORInfo(*args, **kwargs): """_setOORInfo(self, PyObject _self)""" return _core_.Sizer__setOORInfo(*args, **kwargs) @@ -12608,6 +12637,12 @@ class GBPosition(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBPosition): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRow(*args, **kwargs): """GetRow(self) -> int""" return _core_.GBPosition_GetRow(*args, **kwargs) @@ -12687,6 +12722,12 @@ class GBSpan(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSpan): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetRowspan(*args, **kwargs): """GetRowspan(self) -> int""" return _core_.GBSpan_GetRowspan(*args, **kwargs) @@ -12767,6 +12808,12 @@ class GBSizerItem(SizerItem): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_core_.delete_GBSizerItem): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetPos(*args, **kwargs): """ GetPos(self) -> GBPosition diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 262379dab8..676f8b7c61 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1673,8 +1674,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyObject* robj = NULL; swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr")); +#if SWIG_VERSION < 0x010328 #ifdef SWIG_COBJECT_TYPES robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name); #else @@ -1684,7 +1686,9 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyString_FromString(result) : 0; } #endif - +#else // SWIG_VERSION >= 1.3.28 + robj = PySwigObject_New(ptr, swigType, 0); +#endif return robj; } @@ -1794,7 +1798,7 @@ static wxPyCoreAPI API = { #endif - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1845,7 +1849,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1918,7 +1922,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1945,7 +1949,7 @@ SWIG_Check_double(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -2032,31 +2036,30 @@ static PyObject *wxRect_Get(wxRect *self){ } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){ @@ -2197,7 +2200,7 @@ SWIG_Check_char(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2343,7 +2346,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2411,7 +2414,7 @@ SWIG_Check_unsigned_SS_char(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_char PyInt_FromLong /*@@*/ @@ -2671,11 +2674,11 @@ static int wxKeyEvent_GetUnicodeKey(wxKeyEvent *self){ } #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -3037,7 +3040,7 @@ SWIG_Check_float(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_float PyFloat_FromDouble /*@@*/ @@ -3135,6 +3138,8 @@ static wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=0,in wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -3155,6 +3160,8 @@ static wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int p wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Insert method if a valid item type was found @@ -3175,6 +3182,8 @@ static wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion= wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Prepend method if a valid item type was found @@ -3359,6 +3368,8 @@ static wxGBSizerItem *wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxG wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); + if ( info.sizer ) + PyObject_SetAttrString(item,"thisown",Py_False); wxPyEndBlockThreads(blocked); // Now call the real Add method if a valid item type was found @@ -8144,7 +8155,7 @@ static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -8518,7 +8529,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -8885,7 +8896,7 @@ static PyObject *_wrap_new_FileSystem(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -9027,7 +9038,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp2) @@ -9376,7 +9387,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9503,7 +9514,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -9901,7 +9912,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -15834,7 +15845,7 @@ static PyObject *_wrap_Event_GetEventObject(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17171,7 +17182,7 @@ static PyObject *_wrap_new_MouseEvent(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -20567,7 +20578,7 @@ static PyObject *_wrap_EraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20640,7 +20651,7 @@ static PyObject *_wrap_FocusEvent_GetWindow(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20732,7 +20743,7 @@ static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -20985,7 +20996,7 @@ static PyObject *_wrap_MenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22075,7 +22086,7 @@ static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22198,7 +22209,7 @@ static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22559,7 +22570,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22651,7 +22662,7 @@ static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -22714,7 +22725,7 @@ static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24096,7 +24107,7 @@ static PyObject *_wrap_PyApp_GetTopWindow(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -29381,7 +29392,7 @@ static PyObject *_wrap_Window_GetValidator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -30987,7 +30998,7 @@ static PyObject *_wrap_Window_SetCaret(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetCaret",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32431,7 +32442,7 @@ static PyObject *_wrap_Window_SetToolTip(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetToolTip",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32467,7 +32478,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32718,7 +32729,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *, PyObject *args, PyObject *kwa if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizer",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32755,7 +32766,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *, PyObject *args, PyObjec if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_SetSizerAndFit",kwnames,&obj0,&obj1,&obj2)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; if (obj2) { { @@ -32797,7 +32808,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -32854,7 +32865,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33549,7 +33560,7 @@ static PyObject *_wrap_Menu_Append(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33593,7 +33604,7 @@ static PyObject *_wrap_Menu_AppendSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33646,7 +33657,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33715,7 +33726,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33788,7 +33799,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -33836,7 +33847,7 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33899,7 +33910,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -33966,7 +33977,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34016,7 +34027,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34075,7 +34086,7 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34150,7 +34161,7 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34229,7 +34240,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -34277,7 +34288,7 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34338,7 +34349,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34382,7 +34393,7 @@ static PyObject *_wrap_Menu_PrependSeparator(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34435,7 +34446,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34504,7 +34515,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34577,7 +34588,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -34627,7 +34638,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *, PyObject *args, PyObject *kwargs) if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34659,7 +34670,7 @@ static PyObject *_wrap_Menu_RemoveItem(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34948,7 +34959,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *, PyObject *args, PyObject *k if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -34982,7 +34993,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -35568,7 +35579,7 @@ static PyObject *_wrap_Menu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36247,7 +36258,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36631,7 +36642,7 @@ static PyObject *_wrap_MenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -36845,7 +36856,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp3) @@ -39271,6 +39282,31 @@ static PyObject *_wrap_new_SizerItem(PyObject *, PyObject *args, PyObject *kwarg } +static PyObject *_wrap_delete_SizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizerItem *arg1 = (wxSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_SizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_SizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -39395,7 +39431,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *, PyObject *args, PyObject * }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = static_cast(SWIG_As_int(obj1)); @@ -39539,8 +39575,10 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *, PyObject *args, PyObject *k static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxPoint arg2 ; - wxSize arg3 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -39552,28 +39590,16 @@ static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObje SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxPoint * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxPoint"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { - wxSize * argp; - SWIG_Python_ConvertPtr(obj2, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(3)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxSize"); - } - if (SWIG_arg_fail(3)) SWIG_fail; - arg3 = *argp; + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetDimension(arg2,arg3); + (arg1)->SetDimension((wxPoint const &)*arg2,(wxSize const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -40178,7 +40204,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -40199,7 +40225,7 @@ static PyObject *_wrap_SizerItem_SetSizer(PyObject *, PyObject *args, PyObject * if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetSizer",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40426,6 +40452,31 @@ static PyObject * SizerItem_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static PyObject *_wrap_delete_Sizer(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxSizer *arg1 = (wxSizer *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Sizer",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Sizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxSizer *arg1 = (wxSizer *) 0 ; @@ -40774,7 +40825,7 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40810,7 +40861,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kw arg2 = static_cast(SWIG_As_unsigned_SS_long(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(3)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -40840,7 +40891,7 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *k if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_PrependItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -41638,7 +41689,7 @@ static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, P if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42524,7 +42575,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetAffirmativeButton(PyObject *, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42552,7 +42603,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetApplyButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42580,7 +42631,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetNegativeButton(PyObject *, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42608,7 +42659,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetCancelButton(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42636,7 +42687,7 @@ static PyObject *_wrap_StdDialogButtonSizer_GetHelpButton(PyObject *, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -42689,6 +42740,31 @@ static PyObject *_wrap_new_GBPosition(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_delete_GBPosition(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBPosition *arg1 = (wxGBPosition *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBPosition",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBPosition, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBPosition *arg1 = (wxGBPosition *) 0 ; @@ -42989,6 +43065,31 @@ static PyObject *_wrap_new_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSpan *arg1 = (wxGBSpan *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSpan",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSpan, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_GBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxGBSpan *arg1 = (wxGBSpan *) 0 ; @@ -43287,6 +43388,31 @@ static PyObject *_wrap_new_GBSizerItem(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_GBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_GBSizerItem",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_GBSizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxWindow *arg1 = (wxWindow *) 0 ; @@ -43366,7 +43492,7 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:new_GBSizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizer, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { arg2 = &temp2; @@ -43887,7 +44013,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridBagSizer_AddItem",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxGridBagSizer, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxGBSizerItem, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -47332,6 +47458,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL}, { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL}, { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_SizerItem", (PyCFunction) _wrap_delete_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47369,6 +47496,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_SetUserData", (PyCFunction) _wrap_SizerItem_SetUserData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS, NULL}, + { (char *)"delete_Sizer", (PyCFunction) _wrap_delete_Sizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47444,6 +47572,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"StdDialogButtonSizer_GetHelpButton", (PyCFunction) _wrap_StdDialogButtonSizer_GetHelpButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StdDialogButtonSizer_swigregister", StdDialogButtonSizer_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBPosition", (PyCFunction) _wrap_delete_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47454,6 +47583,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSpan", (PyCFunction) _wrap_delete_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47464,6 +47594,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS, NULL}, { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_GBSizerItem", (PyCFunction) _wrap_delete_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 28515a7886..4179e7cc4c 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1624,7 +1625,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1711,7 +1712,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -1800,12 +1801,12 @@ SWIG_Check_unsigned_SS_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_char PyInt_FromLong /*@@*/ - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1858,36 +1859,35 @@ SWIG_Check_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static PyObject *wxPen_GetDashes(wxPen *self){ @@ -2193,7 +2193,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2236,7 +2236,7 @@ static wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ return widths; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -19265,7 +19265,7 @@ static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index 8efb0e07bf..988ad85f55 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -778,6 +778,12 @@ class ToolTip(_core.Object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_ToolTip): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTip(*args, **kwargs): """SetTip(self, String tip)""" return _misc_.ToolTip_SetTip(*args, **kwargs) @@ -826,13 +832,21 @@ class Caret(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Caret): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def Destroy(*args, **kwargs): """ Destroy(self) Deletes the C++ object this Python object is a proxy for. """ - return _misc_.Caret_Destroy(*args, **kwargs) + val = _misc_.Caret_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -1366,6 +1380,12 @@ class Log(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_misc_.delete_Log): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def IsEnabled(*args, **kwargs): """IsEnabled() -> bool""" return _misc_.Log_IsEnabled(*args, **kwargs) @@ -1487,7 +1507,9 @@ class Log(object): TimeStamp = staticmethod(TimeStamp) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.Log_Destroy(*args, **kwargs) + val = _misc_.Log_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class LogPtr(Log): @@ -2690,6 +2712,12 @@ class ArtProvider(object): del newobj.thisown self._setCallbackInfo(self, ArtProvider) + def __del__(self, destroy=_misc_.delete_ArtProvider): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs) @@ -2719,7 +2747,9 @@ class ArtProvider(object): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val RemoveProvider = staticmethod(RemoveProvider) def GetBitmap(*args, **kwargs): @@ -2754,7 +2784,9 @@ class ArtProvider(object): GetSizeHint = staticmethod(GetSizeHint) def Destroy(*args, **kwargs): """Destroy(self)""" - return _misc_.ArtProvider_Destroy(*args, **kwargs) + val = _misc_.ArtProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ArtProviderPtr(ArtProvider): @@ -2843,7 +2875,9 @@ def ArtProvider_RemoveProvider(*args, **kwargs): Remove provider. The provider must have been added previously! The provider is _not_ deleted. """ - return _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs) + args[1].thisown = 1 + return val def ArtProvider_GetBitmap(*args, **kwargs): """ @@ -4839,7 +4873,6 @@ class DataObject(object): GetDataHere(self, DataFormat format) -> String Get the data bytes in the specified format, returns None on failure. - """ return _misc_.DataObject_GetDataHere(*args, **kwargs) diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index c097fc7ca7..fa5be3131f 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1627,7 +1628,7 @@ static swig_module_info swig_module = {swig_types, 173, 0, 0, 0, 0}; - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1666,7 +1667,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1730,7 +1731,7 @@ SWIG_Check_int(PyObject* obj) static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1802,31 +1803,30 @@ SWIG_Check_bool(PyObject* obj) } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1835,7 +1835,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2134,7 +2134,7 @@ static wxString wxLog_TimeStamp(){ return msg; } static void wxLog_Destroy(wxLog *self){ delete self; } -// Make somce wrappers that double any % signs so they are 'escaped' +// Make some wrappers that double any % signs so they are 'escaped' void wxPyLogFatalError(const wxString& msg) { wxString m(msg); @@ -2655,7 +2655,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2687,7 +2687,7 @@ static double wxConfigBase_ReadFloat(wxConfigBase *self,wxString const &key,doub return rv; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -2717,11 +2717,11 @@ static PyObject *wxDateTime_GetAmPmStrings(){ } #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -7005,9 +7005,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolTip, 1); { if (temp1) delete arg1; @@ -7022,6 +7020,31 @@ static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) } +static PyObject *_wrap_delete_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxToolTip *arg1 = (wxToolTip *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ToolTip",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxToolTip, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ToolTip_SetTip(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxToolTip *arg1 = (wxToolTip *) 0 ; @@ -7218,6 +7241,31 @@ static PyObject *_wrap_new_Caret(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Caret(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxCaret *arg1 = (wxCaret *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Caret",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCaret, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Caret_Destroy(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxCaret *arg1 = (wxCaret *) 0 ; @@ -9646,6 +9694,31 @@ static PyObject *_wrap_new_Log(PyObject *, PyObject *args, PyObject *kwargs) { } +static PyObject *_wrap_delete_Log(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxLog *arg1 = (wxLog *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Log",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Log_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; bool result; @@ -9817,7 +9890,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetActiveTarget",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxLog, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -9826,7 +9899,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 0); + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxLog, 1); return resultobj; fail: return NULL; @@ -10510,7 +10583,7 @@ static PyObject *_wrap_LogWindow_GetFrame(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12441,7 +12514,11 @@ static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) { { PyObject* o; o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj, o); + + + } return resultobj; fail: @@ -17435,6 +17512,31 @@ static PyObject *_wrap_new_ArtProvider(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_ArtProvider(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_ArtProvider",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ; @@ -17475,7 +17577,7 @@ static PyObject *_wrap_ArtProvider_PushProvider(PyObject *, PyObject *args, PyOb }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_PushProvider",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -32742,6 +32844,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"MutexGuiLocker_swigregister", MutexGuiLocker_swigregister, METH_VARARGS, NULL}, { (char *)"Thread_IsMain", (PyCFunction) _wrap_Thread_IsMain, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_ToolTip", (PyCFunction) _wrap_new_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ToolTip", (PyCFunction) _wrap_delete_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_SetTip", (PyCFunction) _wrap_ToolTip_SetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetTip", (PyCFunction) _wrap_ToolTip_GetTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_GetWindow", (PyCFunction) _wrap_ToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32749,6 +32852,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"ToolTip_SetDelay", (PyCFunction) _wrap_ToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ToolTip_swigregister", ToolTip_swigregister, METH_VARARGS, NULL}, { (char *)"new_Caret", (PyCFunction) _wrap_new_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_Destroy", (PyCFunction) _wrap_Caret_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -32832,6 +32936,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TimerRunner_Start", (PyCFunction) _wrap_TimerRunner_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TimerRunner_swigregister", TimerRunner_swigregister, METH_VARARGS, NULL}, { (char *)"new_Log", (PyCFunction) _wrap_new_Log, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_Log", (PyCFunction) _wrap_delete_Log, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_IsEnabled", (PyCFunction) _wrap_Log_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_EnableLogging", (PyCFunction) _wrap_Log_EnableLogging, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Log_OnLog", (PyCFunction) _wrap_Log_OnLog, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33049,6 +33154,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS, NULL}, { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_ArtProvider", (PyCFunction) _wrap_delete_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index b36b8014f8..4827f02714 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -699,9 +699,6 @@ class Dialog(TopLevelWindow): return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) - def SendSizeEvent(self): - self.ProcessEvent(wx.SizeEvent((-1,-1))) - class DialogPtr(Dialog): def __init__(self, this): @@ -2198,6 +2195,12 @@ class TaskBarIcon(_core.EvtHandler): del newobj.thisown self._setCallbackInfo(self, TaskBarIcon, 0) + def __del__(self, destroy=_windows_.delete_TaskBarIcon): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)""" return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs) @@ -2208,7 +2211,9 @@ class TaskBarIcon(_core.EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - return _windows_.TaskBarIcon_Destroy(*args, **kwargs) + val = _windows_.TaskBarIcon_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def IsOk(*args, **kwargs): """IsOk(self) -> bool""" diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 728cc6eb6e..856caa742f 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1652,7 +1653,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1776,36 +1777,35 @@ SWIG_Check_bool(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1817,7 +1817,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1844,7 +1844,7 @@ SWIG_Check_double(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -1855,7 +1855,7 @@ SWIG_Check_double(PyObject* obj) static void wxTopLevelWindow_MacSetMetalAppearance(wxTopLevelWindow *self,bool on){ /*wxPyRaiseNotImplemented();*/ } static bool wxTopLevelWindow_MacGetMetalAppearance(wxTopLevelWindow const *self){ /*wxPyRaiseNotImplemented();*/ return false; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1982,7 +1982,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -5274,7 +5274,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp5) @@ -5310,7 +5310,7 @@ static PyObject *_wrap_Frame_GetStatusBar(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5623,7 +5623,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp4) @@ -5659,7 +5659,7 @@ static PyObject *_wrap_Frame_GetToolBar(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6133,7 +6133,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -6191,7 +6191,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -13198,6 +13198,31 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj = NULL; + wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_TaskBarIcon",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyTaskBarIcon, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj = NULL; wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ; @@ -17554,7 +17579,7 @@ static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -17582,7 +17607,7 @@ static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24179,7 +24204,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } return resultobj; fail: @@ -24433,7 +24458,7 @@ static PyObject *_wrap_Printer_PrintDialog(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -24555,7 +24580,7 @@ static PyObject *_wrap_new_Printout(PyObject *, PyObject *args, PyObject *kwargs if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 1); + resultobj = wxPyMake_wxObject(result, (bool)1); } { if (temp1) @@ -24654,7 +24679,7 @@ static PyObject *_wrap_Printout_GetDC(PyObject *, PyObject *args, PyObject *kwar if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -26133,7 +26158,7 @@ static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -26161,7 +26186,7 @@ static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -27897,6 +27922,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL}, { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon__setCallbackInfo", (PyCFunction) _wrap_TaskBarIcon__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"TaskBarIcon_IsOk", (PyCFunction) _wrap_TaskBarIcon_IsOk, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp index c5acd3e7dc..0eb37b96a6 100644 --- a/wxPython/src/msw/calendar_wrap.cpp +++ b/wxPython/src/msw/calendar_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1557,7 +1558,7 @@ static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0}; #include - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1596,7 +1597,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1726,7 +1727,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index c64631e582..31c0d4da8e 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -393,7 +393,9 @@ class GridCellEditor(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _grid.GridCellEditor_Destroy(*args, **kwargs) + val = _grid.GridCellEditor_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class GridCellEditorPtr(GridCellEditor): @@ -1056,7 +1058,9 @@ class PyGridTableBase(GridTableBase): Deletes the C++ object this Python object is a proxy for. """ - return _grid.PyGridTableBase_Destroy(*args, **kwargs) + val = _grid.PyGridTableBase_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val def base_GetTypeName(*args, **kwargs): """base_GetTypeName(self, int row, int col) -> String""" diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index e5fc2bb04d..49a6f07d5c 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -2119,7 +2120,7 @@ SWIG_FromCharPtr(const char* cptr) #define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -2162,7 +2163,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2494,31 +2495,30 @@ static void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } static void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ @@ -2531,7 +2531,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2578,12 +2578,12 @@ static void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -2617,7 +2617,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -3179,7 +3179,7 @@ static PyObject *_wrap_GridCellRenderer_Clone(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -3804,7 +3804,7 @@ static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *, PyObject *args, Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -4101,7 +4101,7 @@ static PyObject *_wrap_GridCellEditor_Clone(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -5295,7 +5295,7 @@ static PyObject *_wrap_new_GridCellAttr(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 1); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)1); } return resultobj; fail: @@ -5323,7 +5323,7 @@ static PyObject *_wrap_GridCellAttr_Clone(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6190,7 +6190,7 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -6234,7 +6234,7 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -6348,7 +6348,7 @@ static PyObject *_wrap_new_GridCellAttrProvider(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 1); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)1); } return resultobj; fail: @@ -6422,7 +6422,7 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6713,7 +6713,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -6916,7 +6916,7 @@ static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttrProvider(result, 0); + resultobj = wxPyMake_wxGridCellAttrProvider(result, (bool)0); } return resultobj; fail: @@ -6973,7 +6973,7 @@ static PyObject *_wrap_GridTableBase_GetView(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -8088,7 +8088,7 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -8957,7 +8957,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -9250,7 +9250,7 @@ static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *, PyObject *arg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -10176,7 +10176,7 @@ static PyObject *_wrap_Grid_GetTable(PyObject *, PyObject *args, PyObject *kwarg if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridTableBase(result, 0); + resultobj = wxPyMake_wxGridTableBase(result, (bool)0); } return resultobj; fail: @@ -13349,7 +13349,7 @@ static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *, PyObject *args, PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellAttr(result, 0); + resultobj = wxPyMake_wxGridCellAttr(result, (bool)0); } return resultobj; fail: @@ -15225,7 +15225,7 @@ static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15265,7 +15265,7 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -15363,7 +15363,7 @@ static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -15403,7 +15403,7 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16346,7 +16346,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } return resultobj; fail: @@ -16386,7 +16386,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } return resultobj; fail: @@ -16422,7 +16422,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellEditor(result, 0); + resultobj = wxPyMake_wxGridCellEditor(result, (bool)0); } { if (temp2) @@ -16466,7 +16466,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxGridCellRenderer(result, 0); + resultobj = wxPyMake_wxGridCellRenderer(result, (bool)0); } { if (temp2) diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index 48ae5a0f97..e73b2e983b 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -2043,7 +2043,6 @@ class HtmlHelpController(HelpControllerBase): """FindTopLevelWindow(self) -> Window""" return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs) - def Destroy(self): pass class HtmlHelpControllerPtr(HtmlHelpController): def __init__(self, this): diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 5136c53ebd..786c3757cd 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1662,7 +1663,7 @@ static swig_module_info swig_module = {swig_types, 198, 0, 0, 0, 0}; static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1701,7 +1702,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1874,31 +1875,30 @@ SWIGINTERNINLINE PyObject* } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1970,7 +1970,7 @@ SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val) { long v = 0; if (SWIG_AsVal_long(obj, &v) && v < 0) { - SWIG_type_error("unsigned number", obj); + SWIG_Python_TypeError("unsigned number", obj); } else if (val) *val = (unsigned long)v; @@ -2027,7 +2027,7 @@ SWIG_Check_unsigned_SS_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2042,11 +2042,11 @@ SWIGINTERNINLINE PyObject* #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ +/*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -2242,7 +2242,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -2522,7 +2522,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2953,7 +2953,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2989,7 +2989,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kw if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp2) @@ -3340,7 +3340,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3424,7 +3424,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -11680,7 +11680,7 @@ static PyObject *_wrap_HtmlHelpWindow_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpWindow_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12154,7 +12154,7 @@ static PyObject *_wrap_HtmlHelpWindow_GetToolBar(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -12636,7 +12636,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetController(PyObject *, PyObject *args, P if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpFrame, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -12912,7 +12912,7 @@ static PyObject *_wrap_HtmlHelpDialog_SetController(PyObject *, PyObject *args, if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpDialog_SetController",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpDialog, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | 0); + SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxHtmlHelpController, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN); if (SWIG_arg_fail(2)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp index f0af56623a..21dca6e1cd 100644 --- a/wxPython/src/msw/media_wrap.cpp +++ b/wxPython/src/msw/media_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1625,7 +1626,7 @@ const wxEventType wxEVT_MEDIA_LOADED = 0; #endif - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1664,7 +1665,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1744,7 +1745,7 @@ SWIG_Check_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -1757,7 +1758,7 @@ SWIG_AsVal_double(PyObject *obj, double* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } diff --git a/wxPython/src/msw/webkit_wrap.cpp b/wxPython/src/msw/webkit_wrap.cpp index 248891bea5..4bdad3b0db 100644 --- a/wxPython/src/msw/webkit_wrap.cpp +++ b/wxPython/src/msw/webkit_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1654,7 +1655,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1732,7 +1733,7 @@ SWIG_Check_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/src/msw/wizard_wrap.cpp b/wxPython/src/msw/wizard_wrap.cpp index 5debb9dba0..d3283c2525 100644 --- a/wxPython/src/msw/wizard_wrap.cpp +++ b/wxPython/src/msw/wizard_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1612,7 +1613,7 @@ static swig_module_info swig_module = {swig_types, 157, 0, 0, 0, 0}; static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1651,7 +1652,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1845,31 +1846,30 @@ static bool wxPyWizardPage_Create(wxPyWizardPage *self,wxWizard *parent,wxBitmap return self->Create(parent, bitmap, res); } - 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 PyObject* t_output_helper(PyObject* result, PyObject* obj) + { + PyObject* o2; + PyObject* o3; + if (!result) { + result = obj; + } else if (result == Py_None) { + Py_DECREF(result); + result = obj; + } else { + if (!PyTuple_Check(result)) { + o2 = result; + result = PyTuple_New(1); + PyTuple_SET_ITEM(result, 0, o2); + } + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, obj); + o2 = result; + result = PySequence_Concat(o2, o3); + Py_DECREF(o2); + Py_DECREF(o3); + } + return result; + } @@ -1996,7 +1996,7 @@ static PyObject *_wrap_WizardEvent_GetPage(PyObject *, PyObject *args, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2095,7 +2095,7 @@ static PyObject *_wrap_WizardPage_GetPrev(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -2123,7 +2123,7 @@ static PyObject *_wrap_WizardPage_GetNext(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3455,7 +3455,7 @@ static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -3574,7 +3574,7 @@ static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp index da0cff2c61..c6705ff150 100644 --- a/wxPython/src/msw/xrc_wrap.cpp +++ b/wxPython/src/msw/xrc_wrap.cpp @@ -9,6 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON +#define SWIG_VERSION 0x010327 #ifdef __cplusplus template class SwigValueWrapper { @@ -1568,7 +1569,7 @@ static swig_module_info swig_module = {swig_types, 106, 0, 0, 0, 0}; static const wxString wxPyIconString(wxT("icon")); static const wxString wxPyFontString(wxT("font")); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1607,7 +1608,7 @@ SWIG_AsVal_long(PyObject* obj, long* val) return 1; } else { - SWIG_type_error("number", obj); + SWIG_Python_TypeError("number", obj); } return 0; } @@ -1689,7 +1690,7 @@ static bool wxXmlResource_LoadFromString(wxXmlResource *self,wxString const &dat return retval; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ + /*@c:\\PROJECTS\\SWIG-1.3.27\\Lib\\python\\pymacros.swg,72,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2562,7 +2563,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *, PyObject *args, PyObj if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2610,7 +2611,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2710,7 +2711,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2810,7 +2811,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *, PyObject *args, PyObjec if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -2918,7 +2919,7 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *, PyObject *args, PyObje if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } { if (temp3) @@ -5366,7 +5367,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *, PyObject *a if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5507,7 +5508,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *, PyObject *args, if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -5535,7 +5536,7 @@ static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *, PyObject *args if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: @@ -6668,7 +6669,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *, PyObject if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, 0); + resultobj = wxPyMake_wxObject(result, (bool)0); } return resultobj; fail: -- 2.45.2