From: Kevin Ollivier Date: Thu, 22 Dec 2005 06:57:46 +0000 (+0000) Subject: Fixes so that wxPython builds on 2.7. Mostly removing references to all functions... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2f91e3dfd2b613494cc95fd4c9341823f56c7bc0 Fixes so that wxPython builds on 2.7. Mostly removing references to all functions that require WXWIN_2_4_COMPATIBILITY to be defined. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/contrib/activex/activex_wrap.cpp b/wxPython/contrib/activex/activex_wrap.cpp index 47062750ee..9db3723194 100644 --- a/wxPython/contrib/activex/activex_wrap.cpp +++ b/wxPython/contrib/activex/activex_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1467,20 +1467,20 @@ static wxString CLSID_GetProgIDString(CLSID *self){ return str; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,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,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,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,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/contrib/animate/msw/animate_wrap.cpp b/wxPython/contrib/animate/msw/animate_wrap.cpp index be4c250097..c249230602 100644 --- a/wxPython/contrib/animate/msw/animate_wrap.cpp +++ b/wxPython/contrib/animate/msw/animate_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1383,7 +1383,7 @@ static swig_type_info *swig_types[26]; static const wxString wxPyAnimationControlNameStr(wxT("animationControl")); static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index 6295dc59aa..d1d279f200 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1419,7 +1419,7 @@ static swig_type_info *swig_types[46]; static const wxString wxPyStaticPictureNameStr(wxStaticPictureNameStr); static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1700,17 +1700,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl) - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -1984,7 +1984,7 @@ SWIG_Check_float(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_float PyFloat_FromDouble /*@@*/ @@ -9518,9 +9518,6 @@ static void *_p_wxChoicebookTo_p_wxObject(void *x) { static void *_p_wxBookCtrlBaseTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxBookCtrlBase *) x)); } -static void *_p_wxNotebookSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *) ((wxNotebookSizer *) x)); -} static void *_p_wxPyTreeCtrlTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxPyTreeCtrl *) x)); } @@ -9932,9 +9929,6 @@ 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_wxBookCtrlSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *) ((wxBookCtrlSizer *) x)); -} static void *_p_wxFindReplaceDialogTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } @@ -10407,7 +10401,7 @@ static swig_type_info _swigt__p_wxControl[] = {{"_p_wxControl", 0, "wxControl *" static swig_type_info _swigt__p_wxPyListCtrl[] = {{"_p_wxPyListCtrl", 0, "wxPyListCtrl *", 0, 0, 0, 0},{"_p_wxPyListCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxPyListCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebook", _p_wxChoicebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBase", _p_wxBookCtrlBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticPicture", _p_wxStaticPictureTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDatePickerCtrl", _p_wxDatePickerCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebook", _p_wxChoicebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBase", _p_wxBookCtrlBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticPicture", _p_wxStaticPictureTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDatePickerCtrl", _p_wxDatePickerCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0, 0, 0, 0},{"_p_wxBitmap", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0, 0, 0, 0},{"_p_wxScrollBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; diff --git a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp index e591f961a1..d5628fffd1 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/msw/glcanvas_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1493,7 +1493,7 @@ SWIG_Check_bool(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp index 2480d086c5..fd1fa28020 100644 --- a/wxPython/contrib/stc/msw/stc_wrap.cpp +++ b/wxPython/contrib/stc/msw/stc_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1386,7 +1386,7 @@ static swig_type_info *swig_types[29]; static const wxString wxPySTCNameStr(wxSTCNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1621,7 +1621,7 @@ SWIG_AsCharPtr(PyObject *obj, char **val) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i index 2a22f8428b..45cbb2f0f0 100644 --- a/wxPython/src/__controls_rename.i +++ b/wxPython/src/__controls_rename.i @@ -136,8 +136,6 @@ %rename(CHB_ALIGN_MASK) wxCHB_ALIGN_MASK; %rename(Choicebook) wxChoicebook; %rename(ChoicebookEvent) wxChoicebookEvent; -%rename(BookCtrlSizer) wxBookCtrlSizer; -%rename(NotebookSizer) wxNotebookSizer; %rename(TOOL_STYLE_BUTTON) wxTOOL_STYLE_BUTTON; %rename(TOOL_STYLE_SEPARATOR) wxTOOL_STYLE_SEPARATOR; %rename(TOOL_STYLE_CONTROL) wxTOOL_STYLE_CONTROL; diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i index 17397d4fa7..7de659f613 100644 --- a/wxPython/src/__misc_rename.i +++ b/wxPython/src/__misc_rename.i @@ -139,7 +139,6 @@ %rename(GetSingleChoice) wxGetSingleChoice; %rename(GetSingleChoiceIndex) wxGetSingleChoiceIndex; %rename(MessageBox) wxMessageBox; -%rename(GetNumberFromUser) wxGetNumberFromUser; %rename(ColourDisplay) wxColourDisplay; %rename(DisplayDepth) wxDisplayDepth; %rename(GetDisplayDepth) wxGetDisplayDepth; diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i index 83fa392e75..268743472d 100644 --- a/wxPython/src/_bitmap.i +++ b/wxPython/src/_bitmap.i @@ -283,8 +283,11 @@ the ``type`` parameter.", ""); #ifdef __WXMSW__ bool CopyFromCursor(const wxCursor& cursor); +// WXWIN_COMPATIBILITY_2_4 + #if 0 int GetQuality(); void SetQuality(int q); + #endif #endif %pythoncode { def __nonzero__(self): return self.Ok() } diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i index b9bbcc8b69..9d6186ad63 100644 --- a/wxPython/src/_functions.i +++ b/wxPython/src/_functions.i @@ -205,6 +205,7 @@ int wxMessageBox(const wxString& message, int x = -1, int y = -1); // WXWIN_COMPATIBILITY_2_4 +#if 0 MustHaveApp(wxGetNumberFromUser); long wxGetNumberFromUser(const wxString& message, const wxString& prompt, @@ -213,7 +214,7 @@ long wxGetNumberFromUser(const wxString& message, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition); - +#endif // GDI Functions MustHaveApp(wxColourDisplay); diff --git a/wxPython/src/_html_rename.i b/wxPython/src/_html_rename.i index 201d5a5922..2322fcaf60 100644 --- a/wxPython/src/_html_rename.i +++ b/wxPython/src/_html_rename.i @@ -68,7 +68,6 @@ %rename(HtmlPrintout) wxHtmlPrintout; %rename(HtmlEasyPrinting) wxHtmlEasyPrinting; %rename(HtmlBookRecord) wxHtmlBookRecord; -%rename(HtmlContentsItem) wxHtmlContentsItem; %rename(HtmlSearchStatus) wxHtmlSearchStatus; %rename(HtmlHelpData) wxHtmlHelpData; %rename(HtmlHelpFrame) wxHtmlHelpFrame; diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i index 15b4ef2b3a..dbb9a97143 100644 --- a/wxPython/src/_listctrl.i +++ b/wxPython/src/_listctrl.i @@ -304,9 +304,10 @@ public: %constant wxEventType wxEVT_COMMAND_LIST_ITEM_FOCUSED; // WXWIN_COMPATIBILITY_2_4 +#if 0 %constant wxEventType wxEVT_COMMAND_LIST_GET_INFO; %constant wxEventType wxEVT_COMMAND_LIST_SET_INFO; - +#endif %pythoncode { @@ -316,8 +317,10 @@ EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDI EVT_LIST_END_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT , 1) EVT_LIST_DELETE_ITEM = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM , 1) EVT_LIST_DELETE_ALL_ITEMS = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1) -EVT_LIST_GET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO , 1) -EVT_LIST_SET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO , 1) +#WXWIN_COMPATIBILITY_2_4 +#EVT_LIST_GET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO , 1) +#EVT_LIST_SET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO , 1) +#END WXWIN_COMPATIBILITY_2_4 EVT_LIST_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED , 1) EVT_LIST_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED , 1) EVT_LIST_KEY_DOWN = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN , 1) @@ -333,8 +336,9 @@ EVT_LIST_COL_DRAGGING = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING EVT_LIST_COL_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG , 1) EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED , 1) -EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO) -EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO) +#WXWIN_COMPATIBILITY_2_4 +#EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO) +#EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO) } //--------------------------------------------------------------------------- diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i index 472cd23e74..1d9565a555 100644 --- a/wxPython/src/_notebook.i +++ b/wxPython/src/_notebook.i @@ -416,7 +416,7 @@ public: %newgroup; // WXWIN_COMPATIBILITY_2_4 - +#if 0 class wxBookCtrlSizer: public wxSizer { public: @@ -443,6 +443,6 @@ public: %pythoncode { NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") } %pythoncode { BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") } - +#endif //--------------------------------------------------------------------------- diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i index 1faf7eebc0..b4911ce8fd 100644 --- a/wxPython/src/_printfw.i +++ b/wxPython/src/_printfw.i @@ -132,6 +132,8 @@ public: // prepared to remove them... // PostScript-specific data +// WXWIN_COMPATIBILITY_2_4 +#if 0 const wxString& GetPrinterCommand(); const wxString& GetPrinterOptions(); const wxString& GetPreviewCommand(); @@ -150,6 +152,7 @@ public: void SetPrinterTranslateX(long x); void SetPrinterTranslateY(long y); void SetPrinterTranslation(long x, long y); +#endif }; @@ -248,9 +251,10 @@ public: bool GetPrintToFile() const; // WXWIN_COMPATIBILITY_2_4 +#if 0 bool GetSetupDialog() const; void SetSetupDialog(bool flag); - +#endif void SetFromPage(int v); void SetToPage(int v); void SetMinPage(int v); diff --git a/wxPython/src/html.i b/wxPython/src/html.i index 67de3efd3b..622b33ff42 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -1111,7 +1111,8 @@ public: }; //--------------------------------------------------------------------------- - +// WXWIN_COMPATIBILITY_2_4 +#if 0 struct wxHtmlContentsItem { %extend { @@ -1122,7 +1123,7 @@ struct wxHtmlContentsItem wxHtmlBookRecord* GetBook() { return self->m_Book; } } }; - +#endif //--------------------------------------------------------------------------- class wxHtmlSearchStatus @@ -1135,7 +1136,10 @@ public: int GetCurIndex(); int GetMaxIndex(); const wxString& GetName(); + // WXWIN_COMPATIBILITY_2_4 +#if 0 wxHtmlContentsItem* GetContentsItem(); +#endif }; //--------------------------------------------------------------------------- @@ -1158,10 +1162,13 @@ public: // TODO: this one needs fixed... const wxHtmlBookRecArray& GetBookRecArray(); + // WXWIN_COMPATIBILITY_2_4 +#if 0 wxHtmlContentsItem* GetContents(); int GetContentsCnt(); wxHtmlContentsItem* GetIndex(); int GetIndexCnt(); +#endif }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index e43ccac198..115de393bc 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -3429,96 +3429,6 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C #--------------------------------------------------------------------------- -class BookCtrlSizer(_core.Sizer): - """Proxy of C++ BookCtrlSizer class""" - def __repr__(self): - return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(self, BookCtrlBase nb) -> BookCtrlSizer""" - newobj = _controls_.new_BookCtrlSizer(*args, **kwargs) - self.this = newobj.this - self.thisown = 1 - del newobj.thisown - self._setOORInfo(self) - - def RecalcSizes(*args, **kwargs): - """ - RecalcSizes(self) - - Using the sizes calculated by `CalcMin` reposition and resize all the - items managed by this sizer. You should not need to call this directly as - it is called by `Layout`. - """ - return _controls_.BookCtrlSizer_RecalcSizes(*args, **kwargs) - - def CalcMin(*args, **kwargs): - """ - CalcMin(self) -> Size - - This method is where the sizer will do the actual calculation of its - children's minimal sizes. You should not need to call this directly as - it is called by `Layout`. - """ - return _controls_.BookCtrlSizer_CalcMin(*args, **kwargs) - - def GetControl(*args, **kwargs): - """GetControl(self) -> BookCtrlBase""" - return _controls_.BookCtrlSizer_GetControl(*args, **kwargs) - - -class BookCtrlSizerPtr(BookCtrlSizer): - def __init__(self, this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = BookCtrlSizer -_controls_.BookCtrlSizer_swigregister(BookCtrlSizerPtr) - -class NotebookSizer(_core.Sizer): - """Proxy of C++ NotebookSizer class""" - def __repr__(self): - return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(self, Notebook nb) -> NotebookSizer""" - newobj = _controls_.new_NotebookSizer(*args, **kwargs) - self.this = newobj.this - self.thisown = 1 - del newobj.thisown - self._setOORInfo(self) - - def RecalcSizes(*args, **kwargs): - """ - RecalcSizes(self) - - Using the sizes calculated by `CalcMin` reposition and resize all the - items managed by this sizer. You should not need to call this directly as - it is called by `Layout`. - """ - return _controls_.NotebookSizer_RecalcSizes(*args, **kwargs) - - def CalcMin(*args, **kwargs): - """ - CalcMin(self) -> Size - - This method is where the sizer will do the actual calculation of its - children's minimal sizes. You should not need to call this directly as - it is called by `Layout`. - """ - return _controls_.NotebookSizer_CalcMin(*args, **kwargs) - - def GetNotebook(*args, **kwargs): - """GetNotebook(self) -> Notebook""" - return _controls_.NotebookSizer_GetNotebook(*args, **kwargs) - - -class NotebookSizerPtr(NotebookSizer): - def __init__(self, this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = NotebookSizer -_controls_.NotebookSizer_swigregister(NotebookSizerPtr) - -NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") -BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") #--------------------------------------------------------------------------- TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON @@ -4459,16 +4369,16 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED -wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO -wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO EVT_LIST_BEGIN_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1) EVT_LIST_BEGIN_RDRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1) EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1) EVT_LIST_END_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT , 1) EVT_LIST_DELETE_ITEM = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM , 1) EVT_LIST_DELETE_ALL_ITEMS = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1) -EVT_LIST_GET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO , 1) -EVT_LIST_SET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO , 1) + + + + EVT_LIST_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED , 1) EVT_LIST_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED , 1) EVT_LIST_KEY_DOWN = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN , 1) @@ -4484,8 +4394,9 @@ EVT_LIST_COL_DRAGGING = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING EVT_LIST_COL_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG , 1) EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED , 1) -EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO) -EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO) + + + #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index fad6279e64..409622f67f 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1340,104 +1340,101 @@ SWIG_Python_GetTypeList() { /* -------- TYPES TABLE (BEGIN) -------- */ #define SWIGTYPE_p_wxTextUrlEvent swig_types[0] -#define SWIGTYPE_p_wxSizer swig_types[1] -#define SWIGTYPE_p_wxCheckBox swig_types[2] -#define SWIGTYPE_p_wxPyTreeCtrl swig_types[3] -#define SWIGTYPE_p_wxEvent swig_types[4] -#define SWIGTYPE_p_wxGenericDirCtrl swig_types[5] -#define SWIGTYPE_p_bool swig_types[6] -#define SWIGTYPE_p_wxItemContainer swig_types[7] -#define SWIGTYPE_p_wxPyListCtrl swig_types[8] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[9] -#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[10] -#define SWIGTYPE_p_wxStaticLine swig_types[11] -#define SWIGTYPE_p_wxControl swig_types[12] -#define SWIGTYPE_p_wxPyControl swig_types[13] -#define SWIGTYPE_p_wxGauge swig_types[14] -#define SWIGTYPE_p_wxToolBarBase swig_types[15] -#define SWIGTYPE_p_wxFont swig_types[16] -#define SWIGTYPE_p_wxToggleButton swig_types[17] -#define SWIGTYPE_p_wxRadioButton swig_types[18] -#define SWIGTYPE_p_wxChoice swig_types[19] -#define SWIGTYPE_p_wxMemoryDC swig_types[20] -#define SWIGTYPE_ptrdiff_t swig_types[21] -#define SWIGTYPE_std__ptrdiff_t swig_types[22] -#define SWIGTYPE_p_wxListItemAttr swig_types[23] -#define SWIGTYPE_p_void swig_types[24] -#define SWIGTYPE_p_int swig_types[25] -#define SWIGTYPE_p_wxSize swig_types[26] -#define SWIGTYPE_p_wxDC swig_types[27] -#define SWIGTYPE_p_wxListView swig_types[28] -#define SWIGTYPE_p_wxIcon swig_types[29] -#define SWIGTYPE_p_wxVisualAttributes swig_types[30] -#define SWIGTYPE_p_wxTextCtrl swig_types[31] -#define SWIGTYPE_p_wxNotebook swig_types[32] -#define SWIGTYPE_p_wxChoicebook swig_types[33] -#define SWIGTYPE_p_wxNotifyEvent swig_types[34] -#define SWIGTYPE_p_wxArrayString swig_types[35] -#define SWIGTYPE_p_form_ops_t swig_types[36] -#define SWIGTYPE_p_wxListbook swig_types[37] -#define SWIGTYPE_p_wxStaticBitmap swig_types[38] -#define SWIGTYPE_p_wxSlider swig_types[39] -#define SWIGTYPE_p_wxStaticBox swig_types[40] -#define SWIGTYPE_p_wxArrayInt swig_types[41] -#define SWIGTYPE_p_wxContextHelp swig_types[42] -#define SWIGTYPE_p_long swig_types[43] -#define SWIGTYPE_p_wxDuplexMode swig_types[44] -#define SWIGTYPE_p_wxBookCtrlBase swig_types[45] -#define SWIGTYPE_p_wxEvtHandler swig_types[46] -#define SWIGTYPE_p_wxListEvent swig_types[47] -#define SWIGTYPE_p_wxCheckListBox swig_types[48] -#define SWIGTYPE_p_wxListBox swig_types[49] -#define SWIGTYPE_p_wxSpinButton swig_types[50] -#define SWIGTYPE_p_wxButton swig_types[51] -#define SWIGTYPE_p_wxBitmapButton swig_types[52] -#define SWIGTYPE_p_wxRect swig_types[53] -#define SWIGTYPE_p_wxContextHelpButton swig_types[54] -#define SWIGTYPE_p_wxRadioBox swig_types[55] -#define SWIGTYPE_p_wxScrollBar swig_types[56] -#define SWIGTYPE_p_char swig_types[57] -#define SWIGTYPE_p_wxComboBox swig_types[58] -#define SWIGTYPE_p_wxTreeItemId swig_types[59] -#define SWIGTYPE_p_wxHelpEvent swig_types[60] -#define SWIGTYPE_p_wxListItem swig_types[61] -#define SWIGTYPE_p_wxNotebookSizer swig_types[62] -#define SWIGTYPE_p_wxSpinEvent swig_types[63] -#define SWIGTYPE_p_wxGenericDragImage swig_types[64] -#define SWIGTYPE_p_wxSpinCtrl swig_types[65] -#define SWIGTYPE_p_wxPaperSize swig_types[66] -#define SWIGTYPE_p_wxImageList swig_types[67] -#define SWIGTYPE_p_wxHelpProvider swig_types[68] -#define SWIGTYPE_p_wxTextAttr swig_types[69] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[70] -#define SWIGTYPE_p_wxChoicebookEvent swig_types[71] -#define SWIGTYPE_p_wxListbookEvent swig_types[72] -#define SWIGTYPE_p_wxNotebookEvent swig_types[73] -#define SWIGTYPE_p_wxPoint swig_types[74] -#define SWIGTYPE_p_wxObject swig_types[75] -#define SWIGTYPE_p_wxCursor swig_types[76] -#define SWIGTYPE_p_wxDateTime swig_types[77] -#define SWIGTYPE_p_wxKeyEvent swig_types[78] -#define SWIGTYPE_p_unsigned_long swig_types[79] -#define SWIGTYPE_p_wxWindow swig_types[80] -#define SWIGTYPE_p_wxString swig_types[81] -#define SWIGTYPE_p_wxBitmap swig_types[82] -#define SWIGTYPE_unsigned_int swig_types[83] -#define SWIGTYPE_p_unsigned_int swig_types[84] -#define SWIGTYPE_p_unsigned_char swig_types[85] -#define SWIGTYPE_p_wxMouseEvent swig_types[86] -#define SWIGTYPE_p_wxBookCtrlBaseEvent swig_types[87] -#define SWIGTYPE_p_wxTreeEvent swig_types[88] -#define SWIGTYPE_p_wxCommandEvent swig_types[89] -#define SWIGTYPE_p_wxStaticText swig_types[90] -#define SWIGTYPE_p_wxDatePickerCtrl swig_types[91] -#define SWIGTYPE_p_wxControlWithItems swig_types[92] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[93] -#define SWIGTYPE_p_wxColour swig_types[94] -#define SWIGTYPE_p_wxToolBar swig_types[95] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[96] -#define SWIGTYPE_p_wxValidator swig_types[97] -static swig_type_info *swig_types[99]; +#define SWIGTYPE_p_wxCheckBox swig_types[1] +#define SWIGTYPE_p_wxPyTreeCtrl swig_types[2] +#define SWIGTYPE_p_wxEvent swig_types[3] +#define SWIGTYPE_p_wxGenericDirCtrl swig_types[4] +#define SWIGTYPE_p_bool swig_types[5] +#define SWIGTYPE_p_wxItemContainer swig_types[6] +#define SWIGTYPE_p_wxPyListCtrl swig_types[7] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[8] +#define SWIGTYPE_p_wxDirFilterListCtrl swig_types[9] +#define SWIGTYPE_p_wxStaticLine swig_types[10] +#define SWIGTYPE_p_wxControl swig_types[11] +#define SWIGTYPE_p_wxPyControl swig_types[12] +#define SWIGTYPE_p_wxGauge swig_types[13] +#define SWIGTYPE_p_wxToolBarBase swig_types[14] +#define SWIGTYPE_p_wxFont swig_types[15] +#define SWIGTYPE_p_wxToggleButton swig_types[16] +#define SWIGTYPE_p_wxRadioButton swig_types[17] +#define SWIGTYPE_p_wxChoice swig_types[18] +#define SWIGTYPE_p_wxMemoryDC swig_types[19] +#define SWIGTYPE_ptrdiff_t swig_types[20] +#define SWIGTYPE_std__ptrdiff_t swig_types[21] +#define SWIGTYPE_p_wxListItemAttr swig_types[22] +#define SWIGTYPE_p_void swig_types[23] +#define SWIGTYPE_p_int swig_types[24] +#define SWIGTYPE_p_wxSize swig_types[25] +#define SWIGTYPE_p_wxDC swig_types[26] +#define SWIGTYPE_p_wxListView swig_types[27] +#define SWIGTYPE_p_wxIcon swig_types[28] +#define SWIGTYPE_p_wxVisualAttributes swig_types[29] +#define SWIGTYPE_p_wxTextCtrl swig_types[30] +#define SWIGTYPE_p_wxNotebook swig_types[31] +#define SWIGTYPE_p_wxChoicebook swig_types[32] +#define SWIGTYPE_p_wxNotifyEvent swig_types[33] +#define SWIGTYPE_p_wxArrayString swig_types[34] +#define SWIGTYPE_p_form_ops_t swig_types[35] +#define SWIGTYPE_p_wxListbook swig_types[36] +#define SWIGTYPE_p_wxStaticBitmap swig_types[37] +#define SWIGTYPE_p_wxSlider swig_types[38] +#define SWIGTYPE_p_wxStaticBox swig_types[39] +#define SWIGTYPE_p_wxArrayInt swig_types[40] +#define SWIGTYPE_p_wxContextHelp swig_types[41] +#define SWIGTYPE_p_long swig_types[42] +#define SWIGTYPE_p_wxDuplexMode swig_types[43] +#define SWIGTYPE_p_wxBookCtrlBase swig_types[44] +#define SWIGTYPE_p_wxEvtHandler swig_types[45] +#define SWIGTYPE_p_wxListEvent swig_types[46] +#define SWIGTYPE_p_wxCheckListBox swig_types[47] +#define SWIGTYPE_p_wxListBox swig_types[48] +#define SWIGTYPE_p_wxSpinButton swig_types[49] +#define SWIGTYPE_p_wxButton swig_types[50] +#define SWIGTYPE_p_wxBitmapButton swig_types[51] +#define SWIGTYPE_p_wxRect swig_types[52] +#define SWIGTYPE_p_wxContextHelpButton swig_types[53] +#define SWIGTYPE_p_wxRadioBox swig_types[54] +#define SWIGTYPE_p_wxScrollBar swig_types[55] +#define SWIGTYPE_p_char swig_types[56] +#define SWIGTYPE_p_wxComboBox swig_types[57] +#define SWIGTYPE_p_wxTreeItemId swig_types[58] +#define SWIGTYPE_p_wxHelpEvent swig_types[59] +#define SWIGTYPE_p_wxListItem swig_types[60] +#define SWIGTYPE_p_wxSpinEvent swig_types[61] +#define SWIGTYPE_p_wxGenericDragImage swig_types[62] +#define SWIGTYPE_p_wxSpinCtrl swig_types[63] +#define SWIGTYPE_p_wxPaperSize swig_types[64] +#define SWIGTYPE_p_wxImageList swig_types[65] +#define SWIGTYPE_p_wxHelpProvider swig_types[66] +#define SWIGTYPE_p_wxTextAttr swig_types[67] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[68] +#define SWIGTYPE_p_wxChoicebookEvent swig_types[69] +#define SWIGTYPE_p_wxListbookEvent swig_types[70] +#define SWIGTYPE_p_wxNotebookEvent swig_types[71] +#define SWIGTYPE_p_wxPoint swig_types[72] +#define SWIGTYPE_p_wxObject swig_types[73] +#define SWIGTYPE_p_wxCursor swig_types[74] +#define SWIGTYPE_p_wxDateTime swig_types[75] +#define SWIGTYPE_p_wxKeyEvent swig_types[76] +#define SWIGTYPE_p_unsigned_long swig_types[77] +#define SWIGTYPE_p_wxWindow swig_types[78] +#define SWIGTYPE_p_wxString swig_types[79] +#define SWIGTYPE_p_wxBitmap swig_types[80] +#define SWIGTYPE_unsigned_int swig_types[81] +#define SWIGTYPE_p_unsigned_int swig_types[82] +#define SWIGTYPE_p_unsigned_char swig_types[83] +#define SWIGTYPE_p_wxMouseEvent swig_types[84] +#define SWIGTYPE_p_wxBookCtrlBaseEvent swig_types[85] +#define SWIGTYPE_p_wxTreeEvent swig_types[86] +#define SWIGTYPE_p_wxCommandEvent swig_types[87] +#define SWIGTYPE_p_wxStaticText swig_types[88] +#define SWIGTYPE_p_wxDatePickerCtrl swig_types[89] +#define SWIGTYPE_p_wxControlWithItems swig_types[90] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[91] +#define SWIGTYPE_p_wxColour swig_types[92] +#define SWIGTYPE_p_wxToolBar swig_types[93] +#define SWIGTYPE_p_wxValidator swig_types[94] +static swig_type_info *swig_types[96]; /* -------- TYPES TABLE (END) -------- */ @@ -1460,7 +1457,7 @@ static swig_type_info *swig_types[99]; static const wxString wxPyButtonNameStr(wxButtonNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1626,7 +1623,7 @@ SWIG_Check_bool(PyObject* obj) static const wxString wxPyChoiceNameStr(wxChoiceNameStr); static const wxString wxPyComboBoxNameStr(wxComboBoxNameStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1986,11 +1983,11 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl); #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -18231,236 +18228,6 @@ static PyObject * ChoicebookEvent_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_BookCtrlSizer(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ; - wxBookCtrlSizer *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "nb", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BookCtrlSizer",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 = (wxBookCtrlSizer *)new wxBookCtrlSizer(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBookCtrlSizer, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BookCtrlSizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlSizer_RecalcSizes",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RecalcSizes(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BookCtrlSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlSizer_CalcMin",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->CalcMin(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &)(result)); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_BookCtrlSizer_GetControl(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ; - wxBookCtrlBase *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrlSizer_GetControl",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBookCtrlSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBookCtrlBase *)(arg1)->GetControl(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBookCtrlBase, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject * BookCtrlSizer_swigregister(PyObject *, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxBookCtrlSizer, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_NotebookSizer(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxNotebook *arg1 = (wxNotebook *) 0 ; - wxNotebookSizer *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "nb", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_NotebookSizer",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotebook, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxNotebookSizer *)new wxNotebookSizer(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebookSizer, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_NotebookSizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotebookSizer_RecalcSizes",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotebookSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RecalcSizes(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_NotebookSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ; - wxSize result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotebookSizer_CalcMin",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotebookSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->CalcMin(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxSize * resultptr; - resultptr = new wxSize((wxSize &)(result)); - resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxSize, 1); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_NotebookSizer_GetNotebook(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ; - wxNotebook *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:NotebookSizer_GetNotebook",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxNotebookSizer, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxNotebook *)(arg1)->GetNotebook(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = wxPyMake_wxObject(result, 0); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject * NotebookSizer_swigregister(PyObject *, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxNotebookSizer, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ; @@ -35510,16 +35277,6 @@ static PyMethodDef SwigMethods[] = { { (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_BookCtrlSizer", (PyCFunction) _wrap_new_BookCtrlSizer, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlSizer_RecalcSizes", (PyCFunction) _wrap_BookCtrlSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlSizer_CalcMin", (PyCFunction) _wrap_BookCtrlSizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlSizer_GetControl", (PyCFunction) _wrap_BookCtrlSizer_GetControl, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BookCtrlSizer_swigregister", BookCtrlSizer_swigregister, METH_VARARGS, NULL}, - { (char *)"new_NotebookSizer", (PyCFunction) _wrap_new_NotebookSizer, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"NotebookSizer_RecalcSizes", (PyCFunction) _wrap_NotebookSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"NotebookSizer_CalcMin", (PyCFunction) _wrap_NotebookSizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"NotebookSizer_GetNotebook", (PyCFunction) _wrap_NotebookSizer_GetNotebook, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"NotebookSizer_swigregister", NotebookSizer_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}, @@ -36000,33 +35757,6 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_wxBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxBoxSizer *) x)); -} -static void *_p_wxStaticBoxSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStaticBoxSizer *) x)); -} -static void *_p_wxStdDialogButtonSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} -static void *_p_wxGridBagSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *)(wxFlexGridSizer *) ((wxGridBagSizer *) x)); -} -static void *_p_wxGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxGridSizer *) x)); -} -static void *_p_wxFlexGridSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) (wxGridSizer *) ((wxFlexGridSizer *) x)); -} -static void *_p_wxNotebookSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxNotebookSizer *) x)); -} -static void *_p_wxPySizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxPySizer *) x)); -} -static void *_p_wxBookCtrlSizerTo_p_wxSizer(void *x) { - return (void *)((wxSizer *) ((wxBookCtrlSizer *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -36732,9 +36462,6 @@ static void *_p_wxListItemTo_p_wxObject(void *x) { static void *_p_wxImageTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImage *) x)); } -static void *_p_wxNotebookSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *) ((wxNotebookSizer *) x)); -} static void *_p_wxScrollWinEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x)); } @@ -36837,9 +36564,6 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxBookCtrlSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *) ((wxBookCtrlSizer *) x)); -} static void *_p_wxMenuBarTo_p_wxWindow(void *x) { return (void *)((wxWindow *) ((wxMenuBar *) x)); } @@ -37033,7 +36757,6 @@ static void *_p_wxPyValidatorTo_p_wxValidator(void *x) { return (void *)((wxValidator *) ((wxPyValidator *) x)); } static swig_type_info _swigt__p_wxTextUrlEvent[] = {{"_p_wxTextUrlEvent", 0, "wxTextUrlEvent *", 0, 0, 0, 0},{"_p_wxTextUrlEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxSizer[] = {{"_p_wxSizer", 0, "wxSizer *", 0, 0, 0, 0},{"_p_wxSizer", 0, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxSizer, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0, 0, 0, 0},{"_p_wxCheckBox", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -37094,7 +36817,6 @@ static swig_type_info _swigt__p_wxComboBox[] = {{"_p_wxComboBox", 0, "wxComboBox static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0, 0, 0, 0},{"_p_wxTreeItemId", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxHelpEvent[] = {{"_p_wxHelpEvent", 0, "wxHelpEvent *", 0, 0, 0, 0},{"_p_wxHelpEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxListItem[] = {{"_p_wxListItem", 0, "wxListItem *", 0, 0, 0, 0},{"_p_wxListItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxNotebookSizer[] = {{"_p_wxNotebookSizer", 0, "wxNotebookSizer *", 0, 0, 0, 0},{"_p_wxNotebookSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSpinEvent[] = {{"_p_wxSpinEvent", 0, "wxSpinEvent *", 0, 0, 0, 0},{"_p_wxSpinEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0, 0, 0, 0},{"_p_wxGenericDragImage", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSpinCtrl[] = {{"_p_wxSpinCtrl", 0, "wxSpinCtrl *", 0, 0, 0, 0},{"_p_wxSpinCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -37107,7 +36829,7 @@ static swig_type_info _swigt__p_wxChoicebookEvent[] = {{"_p_wxChoicebookEvent", static swig_type_info _swigt__p_wxListbookEvent[] = {{"_p_wxListbookEvent", 0, "wxListbookEvent *", 0, 0, 0, 0},{"_p_wxListbookEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotebookEvent[] = {{"_p_wxNotebookEvent", 0, "wxNotebookEvent *", 0, 0, 0, 0},{"_p_wxNotebookEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebook", _p_wxChoicebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBase", _p_wxBookCtrlBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDatePickerCtrl", _p_wxDatePickerCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebook", _p_wxChoicebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBase", _p_wxBookCtrlBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStdDialogButtonSizer", _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoicebookEvent", _p_wxChoicebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlBaseEvent", _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDatePickerCtrl", _p_wxDatePickerCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0, 0, 0, 0},{"_p_wxDateTime", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxKeyEvent[] = {{"_p_wxKeyEvent", 0, "wxKeyEvent *", 0, 0, 0, 0},{"_p_wxKeyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -37128,12 +36850,10 @@ static swig_type_info _swigt__p_wxControlWithItems[] = {{"_p_wxControlWithItems" static swig_type_info _swigt__p_wxToolBarToolBase[] = {{"_p_wxToolBarToolBase", 0, "wxToolBarToolBase *", 0, 0, 0, 0},{"_p_wxToolBarToolBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxToolBar[] = {{"_p_wxToolBar", 0, "wxToolBar *", 0, 0, 0, 0},{"_p_wxToolBar", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxBookCtrlSizer[] = {{"_p_wxBookCtrlSizer", 0, "wxBookCtrlSizer *", 0, 0, 0, 0},{"_p_wxBookCtrlSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxValidator[] = {{"_p_wxValidator", 0, "wxValidator *", 0, 0, 0, 0},{"_p_wxValidator", 0, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxValidator, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info *swig_types_initial[] = { _swigt__p_wxTextUrlEvent, -_swigt__p_wxSizer, _swigt__p_wxCheckBox, _swigt__p_wxPyTreeCtrl, _swigt__p_wxEvent, @@ -37194,7 +36914,6 @@ _swigt__p_wxComboBox, _swigt__p_wxTreeItemId, _swigt__p_wxHelpEvent, _swigt__p_wxListItem, -_swigt__p_wxNotebookSizer, _swigt__p_wxSpinEvent, _swigt__p_wxGenericDragImage, _swigt__p_wxSpinCtrl, @@ -37228,7 +36947,6 @@ _swigt__p_wxControlWithItems, _swigt__p_wxToolBarToolBase, _swigt__p_wxColour, _swigt__p_wxToolBar, -_swigt__p_wxBookCtrlSizer, _swigt__p_wxValidator, 0 }; @@ -38184,8 +37902,6 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_DRAGGING", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_DRAGGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_END_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_FOCUSED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_FOCUSED)); - PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_GET_INFO)); - PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_SET_INFO)); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 22427d78e4..784d7d7341 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -2215,6 +2215,48 @@ def ImageHistogram_MakeKey(*args, **kwargs): """ return _core_.ImageHistogram_MakeKey(*args, **kwargs) +class Image_RGBValue(object): + """Proxy of C++ Image_RGBValue class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxImage_RGBValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self, byte r=0, byte g=0, byte b=0) -> Image_RGBValue""" + newobj = _core_.new_Image_RGBValue(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + red = property(_core_.Image_RGBValue_red_get, _core_.Image_RGBValue_red_set) + green = property(_core_.Image_RGBValue_green_get, _core_.Image_RGBValue_green_set) + blue = property(_core_.Image_RGBValue_blue_get, _core_.Image_RGBValue_blue_set) + +class Image_RGBValuePtr(Image_RGBValue): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Image_RGBValue +_core_.Image_RGBValue_swigregister(Image_RGBValuePtr) + +class Image_HSVValue(object): + """Proxy of C++ Image_HSVValue class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxImage_HSVValue instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self, double h=0.0, double s=0.0, double v=0.0) -> Image_HSVValue""" + newobj = _core_.new_Image_HSVValue(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + hue = property(_core_.Image_HSVValue_hue_get, _core_.Image_HSVValue_hue_set) + saturation = property(_core_.Image_HSVValue_saturation_get, _core_.Image_HSVValue_saturation_set) + value = property(_core_.Image_HSVValue_value_get, _core_.Image_HSVValue_value_set) + +class Image_HSVValuePtr(Image_HSVValue): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = Image_HSVValue +_core_.Image_HSVValue_swigregister(Image_HSVValuePtr) + class Image(Object): """ A platform-independent image class. An image can be created from @@ -2892,6 +2934,25 @@ class Image(Object): """ConvertToMonoBitmap(self, byte red, byte green, byte blue) -> Bitmap""" return _core_.Image_ConvertToMonoBitmap(*args, **kwargs) + def RotateHue(*args, **kwargs): + """ + RotateHue(self, double angle) + + Rotates the hue of each pixel of the image. Hue is a double in the + range -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees + """ + return _core_.Image_RotateHue(*args, **kwargs) + + def RGBtoHSV(*args, **kwargs): + """RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue""" + return _core_.Image_RGBtoHSV(*args, **kwargs) + + RGBtoHSV = staticmethod(RGBtoHSV) + def HSVtoRGB(*args, **kwargs): + """HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue""" + return _core_.Image_HSVtoRGB(*args, **kwargs) + + HSVtoRGB = staticmethod(HSVtoRGB) def __nonzero__(self): return self.Ok() class ImagePtr(Image): @@ -3030,6 +3091,14 @@ def Image_GetImageExtWildcard(*args, **kwargs): """ return _core_.Image_GetImageExtWildcard(*args, **kwargs) +def Image_RGBtoHSV(*args, **kwargs): + """Image_RGBtoHSV(Image_RGBValue rgb) -> Image_HSVValue""" + return _core_.Image_RGBtoHSV(*args, **kwargs) + +def Image_HSVtoRGB(*args, **kwargs): + """Image_HSVtoRGB(Image_HSVValue hsv) -> Image_RGBValue""" + return _core_.Image_HSVtoRGB(*args, **kwargs) + def InitAllImageHandlers(): """ The former functionality of InitAllImageHanders is now done internal to @@ -7897,22 +7966,6 @@ class Window(EvtHandler): """ return _core_.Window_IsBeingDeleted(*args, **kwargs) - def SetTitle(*args, **kwargs): - """ - SetTitle(self, String title) - - Sets the window's title. Applicable only to frames and dialogs. - """ - return _core_.Window_SetTitle(*args, **kwargs) - - def GetTitle(*args, **kwargs): - """ - GetTitle(self) -> String - - Gets the window's title. Applicable only to frames and dialogs. - """ - return _core_.Window_GetTitle(*args, **kwargs) - def SetLabel(*args, **kwargs): """ SetLabel(self, String label) diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 4756001676..772e9668da 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1375,99 +1375,101 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_std__ptrdiff_t swig_types[33] #define SWIGTYPE_p_wxRegion swig_types[34] #define SWIGTYPE_p_wxPoint2D swig_types[35] -#define SWIGTYPE_p_int swig_types[36] -#define SWIGTYPE_p_wxSize swig_types[37] -#define SWIGTYPE_p_wxDC swig_types[38] -#define SWIGTYPE_p_wxPySizer swig_types[39] -#define SWIGTYPE_p_wxVisualAttributes swig_types[40] -#define SWIGTYPE_p_wxNotifyEvent swig_types[41] -#define SWIGTYPE_p_wxPyEvent swig_types[42] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[43] -#define SWIGTYPE_p_form_ops_t swig_types[44] -#define SWIGTYPE_p_wxAppTraits swig_types[45] -#define SWIGTYPE_p_wxArrayString swig_types[46] -#define SWIGTYPE_p_wxShowEvent swig_types[47] -#define SWIGTYPE_p_wxToolTip swig_types[48] -#define SWIGTYPE_p_wxMoveEvent swig_types[49] -#define SWIGTYPE_p_wxSizeEvent swig_types[50] -#define SWIGTYPE_p_wxActivateEvent swig_types[51] -#define SWIGTYPE_p_wxIconizeEvent swig_types[52] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[53] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[54] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[55] -#define SWIGTYPE_p_wxIdleEvent swig_types[56] -#define SWIGTYPE_p_wxDateEvent swig_types[57] -#define SWIGTYPE_p_wxMenuItem swig_types[58] -#define SWIGTYPE_p_wxStaticBox swig_types[59] -#define SWIGTYPE_p_long swig_types[60] -#define SWIGTYPE_p_wxDuplexMode swig_types[61] -#define SWIGTYPE_p_wxTIFFHandler swig_types[62] -#define SWIGTYPE_p_wxXPMHandler swig_types[63] -#define SWIGTYPE_p_wxPNMHandler swig_types[64] -#define SWIGTYPE_p_wxJPEGHandler swig_types[65] -#define SWIGTYPE_p_wxPCXHandler swig_types[66] -#define SWIGTYPE_p_wxGIFHandler swig_types[67] -#define SWIGTYPE_p_wxPNGHandler swig_types[68] -#define SWIGTYPE_p_wxANIHandler swig_types[69] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[70] -#define SWIGTYPE_p_wxZipFSHandler swig_types[71] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[72] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[73] -#define SWIGTYPE_p_wxEvtHandler swig_types[74] -#define SWIGTYPE_p_wxCURHandler swig_types[75] -#define SWIGTYPE_p_wxICOHandler swig_types[76] -#define SWIGTYPE_p_wxBMPHandler swig_types[77] -#define SWIGTYPE_p_wxImageHandler swig_types[78] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[79] -#define SWIGTYPE_p_wxRect swig_types[80] -#define SWIGTYPE_p_wxButton swig_types[81] -#define SWIGTYPE_p_wxGBSpan swig_types[82] -#define SWIGTYPE_p_wxPropagateOnce swig_types[83] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[84] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[85] -#define SWIGTYPE_p_char swig_types[86] -#define SWIGTYPE_p_wxGBPosition swig_types[87] -#define SWIGTYPE_p_wxImage swig_types[88] -#define SWIGTYPE_p_wxFrame swig_types[89] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[90] -#define SWIGTYPE_p_wxPaperSize swig_types[91] -#define SWIGTYPE_p_wxImageHistogram swig_types[92] -#define SWIGTYPE_p_wxPoint swig_types[93] -#define SWIGTYPE_p_wxCursor swig_types[94] -#define SWIGTYPE_p_wxObject swig_types[95] -#define SWIGTYPE_p_wxInputStream swig_types[96] -#define SWIGTYPE_p_wxOutputStream swig_types[97] -#define SWIGTYPE_p_wxPyInputStream swig_types[98] -#define SWIGTYPE_p_wxDateTime swig_types[99] -#define SWIGTYPE_p_wxKeyEvent swig_types[100] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[101] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[102] -#define SWIGTYPE_p_unsigned_long swig_types[103] -#define SWIGTYPE_p_wxWindow swig_types[104] -#define SWIGTYPE_p_wxMenuBar swig_types[105] -#define SWIGTYPE_p_wxFileSystem swig_types[106] -#define SWIGTYPE_p_wxBitmap swig_types[107] -#define SWIGTYPE_unsigned_int swig_types[108] -#define SWIGTYPE_p_unsigned_int swig_types[109] -#define SWIGTYPE_p_wxMenuEvent swig_types[110] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[111] -#define SWIGTYPE_p_unsigned_char swig_types[112] -#define SWIGTYPE_p_wxEraseEvent swig_types[113] -#define SWIGTYPE_p_wxMouseEvent swig_types[114] -#define SWIGTYPE_p_wxCloseEvent swig_types[115] -#define SWIGTYPE_p_wxPyApp swig_types[116] -#define SWIGTYPE_p_wxCommandEvent swig_types[117] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[118] -#define SWIGTYPE_p_wxPyDropTarget swig_types[119] -#define SWIGTYPE_p_wxQuantize swig_types[120] -#define SWIGTYPE_p_wxFocusEvent swig_types[121] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[122] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[123] -#define SWIGTYPE_p_wxControlWithItems swig_types[124] -#define SWIGTYPE_p_wxColour swig_types[125] -#define SWIGTYPE_p_wxValidator swig_types[126] -#define SWIGTYPE_p_wxPyValidator swig_types[127] -static swig_type_info *swig_types[129]; +#define SWIGTYPE_p_wxImage_HSVValue swig_types[36] +#define SWIGTYPE_p_int swig_types[37] +#define SWIGTYPE_p_wxSize swig_types[38] +#define SWIGTYPE_p_wxDC swig_types[39] +#define SWIGTYPE_p_wxPySizer swig_types[40] +#define SWIGTYPE_p_wxVisualAttributes swig_types[41] +#define SWIGTYPE_p_wxImage_RGBValue swig_types[42] +#define SWIGTYPE_p_wxNotifyEvent swig_types[43] +#define SWIGTYPE_p_wxPyEvent swig_types[44] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[45] +#define SWIGTYPE_p_form_ops_t swig_types[46] +#define SWIGTYPE_p_wxAppTraits swig_types[47] +#define SWIGTYPE_p_wxArrayString swig_types[48] +#define SWIGTYPE_p_wxShowEvent swig_types[49] +#define SWIGTYPE_p_wxToolTip swig_types[50] +#define SWIGTYPE_p_wxMoveEvent swig_types[51] +#define SWIGTYPE_p_wxSizeEvent swig_types[52] +#define SWIGTYPE_p_wxActivateEvent swig_types[53] +#define SWIGTYPE_p_wxIconizeEvent swig_types[54] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[55] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[56] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[57] +#define SWIGTYPE_p_wxIdleEvent swig_types[58] +#define SWIGTYPE_p_wxDateEvent swig_types[59] +#define SWIGTYPE_p_wxMenuItem swig_types[60] +#define SWIGTYPE_p_wxStaticBox swig_types[61] +#define SWIGTYPE_p_long swig_types[62] +#define SWIGTYPE_p_wxDuplexMode swig_types[63] +#define SWIGTYPE_p_wxTIFFHandler swig_types[64] +#define SWIGTYPE_p_wxXPMHandler swig_types[65] +#define SWIGTYPE_p_wxPNMHandler swig_types[66] +#define SWIGTYPE_p_wxJPEGHandler swig_types[67] +#define SWIGTYPE_p_wxPCXHandler swig_types[68] +#define SWIGTYPE_p_wxGIFHandler swig_types[69] +#define SWIGTYPE_p_wxPNGHandler swig_types[70] +#define SWIGTYPE_p_wxANIHandler swig_types[71] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[72] +#define SWIGTYPE_p_wxZipFSHandler swig_types[73] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[74] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[75] +#define SWIGTYPE_p_wxEvtHandler swig_types[76] +#define SWIGTYPE_p_wxCURHandler swig_types[77] +#define SWIGTYPE_p_wxICOHandler swig_types[78] +#define SWIGTYPE_p_wxBMPHandler swig_types[79] +#define SWIGTYPE_p_wxImageHandler swig_types[80] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[81] +#define SWIGTYPE_p_wxRect swig_types[82] +#define SWIGTYPE_p_wxButton swig_types[83] +#define SWIGTYPE_p_wxGBSpan swig_types[84] +#define SWIGTYPE_p_wxPropagateOnce swig_types[85] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[86] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[87] +#define SWIGTYPE_p_char swig_types[88] +#define SWIGTYPE_p_wxGBPosition swig_types[89] +#define SWIGTYPE_p_wxImage swig_types[90] +#define SWIGTYPE_p_wxFrame swig_types[91] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[92] +#define SWIGTYPE_p_wxPaperSize swig_types[93] +#define SWIGTYPE_p_wxImageHistogram swig_types[94] +#define SWIGTYPE_p_wxPoint swig_types[95] +#define SWIGTYPE_p_wxCursor swig_types[96] +#define SWIGTYPE_p_wxObject swig_types[97] +#define SWIGTYPE_p_wxInputStream swig_types[98] +#define SWIGTYPE_p_wxOutputStream swig_types[99] +#define SWIGTYPE_p_wxPyInputStream swig_types[100] +#define SWIGTYPE_p_wxDateTime swig_types[101] +#define SWIGTYPE_p_wxKeyEvent swig_types[102] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[103] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[104] +#define SWIGTYPE_p_unsigned_long swig_types[105] +#define SWIGTYPE_p_wxWindow swig_types[106] +#define SWIGTYPE_p_wxMenuBar swig_types[107] +#define SWIGTYPE_p_wxFileSystem swig_types[108] +#define SWIGTYPE_p_wxBitmap swig_types[109] +#define SWIGTYPE_unsigned_int swig_types[110] +#define SWIGTYPE_p_unsigned_int swig_types[111] +#define SWIGTYPE_p_wxMenuEvent swig_types[112] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[113] +#define SWIGTYPE_p_unsigned_char swig_types[114] +#define SWIGTYPE_p_wxMouseEvent swig_types[115] +#define SWIGTYPE_p_wxEraseEvent swig_types[116] +#define SWIGTYPE_p_wxCloseEvent swig_types[117] +#define SWIGTYPE_p_wxPyApp swig_types[118] +#define SWIGTYPE_p_wxCommandEvent swig_types[119] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[120] +#define SWIGTYPE_p_wxPyDropTarget swig_types[121] +#define SWIGTYPE_p_wxQuantize swig_types[122] +#define SWIGTYPE_p_wxFocusEvent swig_types[123] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[124] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[125] +#define SWIGTYPE_p_wxControlWithItems swig_types[126] +#define SWIGTYPE_p_wxColour swig_types[127] +#define SWIGTYPE_p_wxValidator swig_types[128] +#define SWIGTYPE_p_wxPyValidator swig_types[129] +static swig_type_info *swig_types[131]; /* -------- TYPES TABLE (END) -------- */ @@ -1668,7 +1670,7 @@ static wxPyCoreAPI API = { #endif - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1832,7 +1834,7 @@ SWIG_Check_double(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -2084,7 +2086,7 @@ SWIG_Check_char(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2298,7 +2300,7 @@ SWIG_Check_unsigned_SS_char(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_char PyInt_FromLong /*@@*/ @@ -2343,6 +2345,11 @@ static unsigned long wxImageHistogram_GetCountColour(wxImageHistogram *self,wxCo typedef unsigned char* buffer; + +// Pull the nested class out to the top level for SWIG's sake +#define wxImage_RGBValue wxImage::RGBValue +#define wxImage_HSVValue wxImage::HSVValue + static wxImage *new_wxImage(int width=0,int height=0,bool clear=true){ if (width > 0 && height > 0) return new wxImage(width, height, clear); @@ -2548,11 +2555,11 @@ static int wxKeyEvent_GetUnicodeKey(wxKeyEvent *self){ } #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -2913,7 +2920,7 @@ SWIG_Check_float(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_float PyFloat_FromDouble /*@@*/ @@ -10464,6 +10471,406 @@ static PyObject * ImageHistogram_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static PyObject *_wrap_new_Image_RGBValue(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + byte arg1 = (byte) 0 ; + byte arg2 = (byte) 0 ; + byte arg3 = (byte) 0 ; + wxImage_RGBValue *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "r",(char *) "g",(char *) "b", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Image_RGBValue",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (byte)(SWIG_As_unsigned_SS_char(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxImage_RGBValue *)new wxImage_RGBValue(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage_RGBValue, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_red_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "red", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_RGBValue_red_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->red = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_red_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_RGBValue_red_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (byte) ((arg1)->red); + + { + resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_green_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "green", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_RGBValue_green_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->green = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_green_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_RGBValue_green_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (byte) ((arg1)->green); + + { + resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_blue_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "blue", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_RGBValue_blue_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->blue = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBValue_blue_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue *arg1 = (wxImage_RGBValue *) 0 ; + byte result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_RGBValue_blue_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (byte) ((arg1)->blue); + + { + resultobj = SWIG_From_unsigned_SS_char((unsigned char)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * Image_RGBValue_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxImage_RGBValue, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_Image_HSVValue(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + double arg1 = (double) 0.0 ; + double arg2 = (double) 0.0 ; + double arg3 = (double) 0.0 ; + wxImage_HSVValue *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "h",(char *) "s",(char *) "v", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_Image_HSVValue",kwnames,&obj0,&obj1,&obj2)) goto fail; + if (obj0) { + { + arg1 = (double)(SWIG_As_double(obj0)); + if (SWIG_arg_fail(1)) SWIG_fail; + } + } + if (obj1) { + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + } + if (obj2) { + { + arg3 = (double)(SWIG_As_double(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxImage_HSVValue *)new wxImage_HSVValue(arg1,arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage_HSVValue, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_hue_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "hue", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_HSVValue_hue_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->hue = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_hue_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HSVValue_hue_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (double) ((arg1)->hue); + + { + resultobj = SWIG_From_double((double)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_saturation_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "saturation", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_HSVValue_saturation_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->saturation = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_saturation_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HSVValue_saturation_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (double) ((arg1)->saturation); + + { + resultobj = SWIG_From_double((double)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_value_set(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "value", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_HSVValue_value_set",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + if (arg1) (arg1)->value = arg2; + + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVValue_value_get(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue *arg1 = (wxImage_HSVValue *) 0 ; + double result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HSVValue_value_get",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + result = (double) ((arg1)->value); + + { + resultobj = SWIG_From_double((double)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject * Image_HSVValue_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxImage_HSVValue, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} static PyObject *_wrap_new_Image(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; @@ -13816,6 +14223,113 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyO } +static PyObject *_wrap_Image_RotateHue(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage *arg1 = (wxImage *) 0 ; + double arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "angle", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_RotateHue",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RotateHue(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_RGBtoHSV(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_RGBValue arg1 ; + wxImage_HSVValue result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "rgb", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_RGBtoHSV",kwnames,&obj0)) goto fail; + { + wxImage_RGBValue * argp; + SWIG_Python_ConvertPtr(obj0, (void **)&argp, SWIGTYPE_p_wxImage_RGBValue, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(1)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("wxImage_RGBValue"); + } + if (SWIG_arg_fail(1)) SWIG_fail; + arg1 = *argp; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxImage::RGBtoHSV(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxImage_HSVValue * resultptr; + resultptr = new wxImage_HSVValue((wxImage_HSVValue &)(result)); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage_HSVValue, 1); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Image_HSVtoRGB(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage_HSVValue arg1 ; + wxImage_RGBValue result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "hsv", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_HSVtoRGB",kwnames,&obj0)) goto fail; + { + wxImage_HSVValue * argp; + SWIG_Python_ConvertPtr(obj0, (void **)&argp, SWIGTYPE_p_wxImage_HSVValue, SWIG_POINTER_EXCEPTION); + if (SWIG_arg_fail(1)) SWIG_fail; + if (argp == NULL) { + SWIG_null_ref("wxImage_HSVValue"); + } + if (SWIG_arg_fail(1)) SWIG_fail; + arg1 = *argp; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxImage::HSVtoRGB(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + wxImage_RGBValue * resultptr; + resultptr = new wxImage_RGBValue((wxImage_RGBValue &)(result)); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxImage_RGBValue, 1); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * Image_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -25290,79 +25804,6 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_Window_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "title", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetTitle",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; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetTitle((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_Window_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxString result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetTitle",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxWindow const *)arg1)->GetTitle(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Window_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -45656,6 +46097,22 @@ static PyMethodDef SwigMethods[] = { { (char *)"ImageHistogram_GetCountRGB", (PyCFunction) _wrap_ImageHistogram_GetCountRGB, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHistogram_GetCountColour", (PyCFunction) _wrap_ImageHistogram_GetCountColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHistogram_swigregister", ImageHistogram_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Image_RGBValue", (PyCFunction) _wrap_new_Image_RGBValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_red_set", (PyCFunction) _wrap_Image_RGBValue_red_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_red_get", (PyCFunction) _wrap_Image_RGBValue_red_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_green_set", (PyCFunction) _wrap_Image_RGBValue_green_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_green_get", (PyCFunction) _wrap_Image_RGBValue_green_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_blue_set", (PyCFunction) _wrap_Image_RGBValue_blue_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_blue_get", (PyCFunction) _wrap_Image_RGBValue_blue_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBValue_swigregister", Image_RGBValue_swigregister, METH_VARARGS, NULL}, + { (char *)"new_Image_HSVValue", (PyCFunction) _wrap_new_Image_HSVValue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_hue_set", (PyCFunction) _wrap_Image_HSVValue_hue_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_hue_get", (PyCFunction) _wrap_Image_HSVValue_hue_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_saturation_set", (PyCFunction) _wrap_Image_HSVValue_saturation_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_saturation_get", (PyCFunction) _wrap_Image_HSVValue_saturation_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_value_set", (PyCFunction) _wrap_Image_HSVValue_value_set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_value_get", (PyCFunction) _wrap_Image_HSVValue_value_get, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVValue_swigregister", Image_HSVValue_swigregister, METH_VARARGS, NULL}, { (char *)"new_Image", (PyCFunction) _wrap_new_Image, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_Image", (PyCFunction) _wrap_delete_Image, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45735,6 +46192,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"Image_GetImageExtWildcard", (PyCFunction) _wrap_Image_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_ConvertToBitmap", (PyCFunction) _wrap_Image_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_ConvertToMonoBitmap", (PyCFunction) _wrap_Image_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RotateHue", (PyCFunction) _wrap_Image_RotateHue, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_RGBtoHSV", (PyCFunction) _wrap_Image_RGBtoHSV, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_HSVtoRGB", (PyCFunction) _wrap_Image_HSVtoRGB, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_swigregister", Image_swigregister, METH_VARARGS, NULL}, { (char *)"new_BMPHandler", (PyCFunction) _wrap_new_BMPHandler, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BMPHandler_swigregister", BMPHandler_swigregister, METH_VARARGS, NULL}, @@ -46161,8 +46621,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_Destroy", (PyCFunction) _wrap_Window_Destroy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_DestroyChildren", (PyCFunction) _wrap_Window_DestroyChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_IsBeingDeleted", (PyCFunction) _wrap_Window_IsBeingDeleted, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Window_SetTitle", (PyCFunction) _wrap_Window_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Window_GetTitle", (PyCFunction) _wrap_Window_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_SetLabel", (PyCFunction) _wrap_Window_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -47289,11 +47747,13 @@ static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0 static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::ptrdiff_t", 0, 0, 0, 0},{"_std__ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRegion[] = {{"_p_wxRegion", 0, "wxRegion *", 0, 0, 0, 0},{"_p_wxRegion", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint2D[] = {{"_p_wxPoint2D", 0, "wxPoint2D *", 0, 0, 0, 0},{"_p_wxPoint2D", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxImage_HSVValue[] = {{"_p_wxImage_HSVValue", 0, "wxImage_HSVValue *", 0, 0, 0, 0},{"_p_wxImage_HSVValue", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSize[] = {{"_p_wxSize", 0, "wxSize *", 0, 0, 0, 0},{"_p_wxSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDC[] = {{"_p_wxDC", 0, "wxDC *", 0, 0, 0, 0},{"_p_wxDC", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPySizer[] = {{"_p_wxPySizer", 0, "wxPySizer *", 0, 0, 0, 0},{"_p_wxPySizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxVisualAttributes[] = {{"_p_wxVisualAttributes", 0, "wxVisualAttributes *", 0, 0, 0, 0},{"_p_wxVisualAttributes", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxImage_RGBValue[] = {{"_p_wxImage_RGBValue", 0, "wxImage_RGBValue *", 0, 0, 0, 0},{"_p_wxImage_RGBValue", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0, 0, 0, 0},{"_p_wxNotifyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyEvent[] = {{"_p_wxPyEvent", 0, "wxPyEvent *", 0, 0, 0, 0},{"_p_wxPyEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPropagationDisabler[] = {{"_p_wxPropagationDisabler", 0, "wxPropagationDisabler *", 0, 0, 0, 0},{"_p_wxPropagationDisabler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -47366,8 +47826,8 @@ static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsign static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0, 0, 0, 0},{"_p_wxMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0, 0, 0, 0},{"_p_wxCloseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyApp[] = {{"_p_wxPyApp", 0, "wxPyApp *", 0, 0, 0, 0},{"_p_wxPyApp", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", 0, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -47419,11 +47879,13 @@ _swigt__ptrdiff_t, _swigt__std__ptrdiff_t, _swigt__p_wxRegion, _swigt__p_wxPoint2D, +_swigt__p_wxImage_HSVValue, _swigt__p_int, _swigt__p_wxSize, _swigt__p_wxDC, _swigt__p_wxPySizer, _swigt__p_wxVisualAttributes, +_swigt__p_wxImage_RGBValue, _swigt__p_wxNotifyEvent, _swigt__p_wxPyEvent, _swigt__p_wxPropagationDisabler, @@ -47496,8 +47958,8 @@ _swigt__p_unsigned_int, _swigt__p_wxMenuEvent, _swigt__p_wxContextMenuEvent, _swigt__p_unsigned_char, -_swigt__p_wxEraseEvent, _swigt__p_wxMouseEvent, +_swigt__p_wxEraseEvent, _swigt__p_wxCloseEvent, _swigt__p_wxPyApp, _swigt__p_wxCommandEvent, diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index c46d1eac14..fd35da917e 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -719,14 +719,6 @@ class Bitmap(GDIObject): """CopyFromCursor(self, Cursor cursor) -> bool""" return _gdi_.Bitmap_CopyFromCursor(*args, **kwargs) - def GetQuality(*args, **kwargs): - """GetQuality(self) -> int""" - return _gdi_.Bitmap_GetQuality(*args, **kwargs) - - def SetQuality(*args, **kwargs): - """SetQuality(self, int q)""" - return _gdi_.Bitmap_SetQuality(*args, **kwargs) - def __nonzero__(self): return self.Ok() def __eq__(*args, **kwargs): """__eq__(self, Bitmap other) -> bool""" diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index ff539515ae..ec6c280467 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1632,12 +1632,12 @@ SWIG_Check_unsigned_SS_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_char PyInt_FromLong /*@@*/ - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1690,7 +1690,7 @@ SWIG_Check_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -2068,7 +2068,7 @@ static wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){ return widths; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -5011,65 +5011,6 @@ static PyObject *_wrap_Bitmap_CopyFromCursor(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_Bitmap_GetQuality(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = (wxBitmap *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Bitmap_GetQuality",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetQuality(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Bitmap_SetQuality(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxBitmap *arg1 = (wxBitmap *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "q", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_SetQuality",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxBitmap, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetQuality(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Bitmap___eq__(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -22427,8 +22368,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Bitmap_GetQuality", (PyCFunction) _wrap_Bitmap_GetQuality, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"Bitmap_SetQuality", (PyCFunction) _wrap_Bitmap_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index edf76dee9e..06d7a673b6 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -348,7 +348,7 @@ def GetOsDescription(*args, **kwargs): return _misc_.GetOsDescription(*args, **kwargs) def GetFreeMemory(*args, **kwargs): - """GetFreeMemory() -> long""" + """GetFreeMemory() -> wxMemorySize""" return _misc_.GetFreeMemory(*args, **kwargs) SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT @@ -486,14 +486,6 @@ def MessageBox(*args, **kwargs): """ return _misc_.MessageBox(*args, **kwargs) -def GetNumberFromUser(*args, **kwargs): - """ - GetNumberFromUser(String message, String prompt, String caption, long value, - long min=0, long max=100, Window parent=None, - Point pos=DefaultPosition) -> long - """ - return _misc_.GetNumberFromUser(*args, **kwargs) - def ColourDisplay(*args, **kwargs): """ColourDisplay() -> bool""" return _misc_.ColourDisplay(*args, **kwargs) diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index e6fe38300b..c248eaf625 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1351,94 +1351,95 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_p_wxDisplay swig_types[9] #define SWIGTYPE_p_wxFileType swig_types[10] #define SWIGTYPE_p_wxLogGui swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxDataFormat swig_types[13] -#define SWIGTYPE_p_wxTimerEvent swig_types[14] -#define SWIGTYPE_p_wxCaret swig_types[15] -#define SWIGTYPE_ptrdiff_t swig_types[16] -#define SWIGTYPE_std__ptrdiff_t swig_types[17] -#define SWIGTYPE_p_void swig_types[18] -#define SWIGTYPE_p_int swig_types[19] -#define SWIGTYPE_p_wxSize swig_types[20] -#define SWIGTYPE_p_wxClipboard swig_types[21] -#define SWIGTYPE_p_wxStopWatch swig_types[22] -#define SWIGTYPE_p_wxDC swig_types[23] -#define SWIGTYPE_p_wxClipboardLocker swig_types[24] -#define SWIGTYPE_p_wxIcon swig_types[25] -#define SWIGTYPE_p_wxLogStderr swig_types[26] -#define SWIGTYPE_p_wxLogTextCtrl swig_types[27] -#define SWIGTYPE_p_wxTextCtrl swig_types[28] -#define SWIGTYPE_p_wxBusyCursor swig_types[29] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] -#define SWIGTYPE_p_wxTextDataObject swig_types[31] -#define SWIGTYPE_p_wxDataObject swig_types[32] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[33] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[34] -#define SWIGTYPE_p_wxFileDataObject swig_types[35] -#define SWIGTYPE_p_wxCustomDataObject swig_types[36] -#define SWIGTYPE_p_wxURLDataObject swig_types[37] -#define SWIGTYPE_p_wxMetafileDataObject swig_types[38] -#define SWIGTYPE_p_wxSound swig_types[39] -#define SWIGTYPE_p_wxTimerRunner swig_types[40] -#define SWIGTYPE_p_wxLogWindow swig_types[41] -#define SWIGTYPE_p_wxTimeSpan swig_types[42] -#define SWIGTYPE_p_wxArrayString swig_types[43] -#define SWIGTYPE_p_wxWindowDisabler swig_types[44] -#define SWIGTYPE_p_form_ops_t swig_types[45] -#define SWIGTYPE_p_wxToolTip swig_types[46] -#define SWIGTYPE_p_wxDataObjectComposite swig_types[47] -#define SWIGTYPE_p_wxSystemSettings swig_types[48] -#define SWIGTYPE_p_wxFileConfig swig_types[49] -#define SWIGTYPE_p_wxVideoMode swig_types[50] -#define SWIGTYPE_p_wxDataObjectSimple swig_types[51] -#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[52] -#define SWIGTYPE_p_wxDuplexMode swig_types[53] -#define SWIGTYPE_p_wxEvtHandler swig_types[54] -#define SWIGTYPE_p_wxRect swig_types[55] -#define SWIGTYPE_p_char swig_types[56] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[57] -#define SWIGTYPE_p_wxStandardPaths swig_types[58] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[59] -#define SWIGTYPE_p_wxFrame swig_types[60] -#define SWIGTYPE_p_wxTimer swig_types[61] -#define SWIGTYPE_p_wxPaperSize swig_types[62] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[63] -#define SWIGTYPE_p_wxPyArtProvider swig_types[64] +#define SWIGTYPE_p_wxMemorySize swig_types[12] +#define SWIGTYPE_p_wxFont swig_types[13] +#define SWIGTYPE_p_wxDataFormat swig_types[14] +#define SWIGTYPE_p_wxTimerEvent swig_types[15] +#define SWIGTYPE_p_wxCaret swig_types[16] +#define SWIGTYPE_ptrdiff_t swig_types[17] +#define SWIGTYPE_std__ptrdiff_t swig_types[18] +#define SWIGTYPE_p_void swig_types[19] +#define SWIGTYPE_p_int swig_types[20] +#define SWIGTYPE_p_wxSize swig_types[21] +#define SWIGTYPE_p_wxClipboard swig_types[22] +#define SWIGTYPE_p_wxStopWatch swig_types[23] +#define SWIGTYPE_p_wxDC swig_types[24] +#define SWIGTYPE_p_wxClipboardLocker swig_types[25] +#define SWIGTYPE_p_wxIcon swig_types[26] +#define SWIGTYPE_p_wxLogStderr swig_types[27] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[28] +#define SWIGTYPE_p_wxTextCtrl swig_types[29] +#define SWIGTYPE_p_wxBusyCursor swig_types[30] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[31] +#define SWIGTYPE_p_wxTextDataObject swig_types[32] +#define SWIGTYPE_p_wxDataObject swig_types[33] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[34] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[35] +#define SWIGTYPE_p_wxFileDataObject swig_types[36] +#define SWIGTYPE_p_wxCustomDataObject swig_types[37] +#define SWIGTYPE_p_wxURLDataObject swig_types[38] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[39] +#define SWIGTYPE_p_wxSound swig_types[40] +#define SWIGTYPE_p_wxTimerRunner swig_types[41] +#define SWIGTYPE_p_wxLogWindow swig_types[42] +#define SWIGTYPE_p_wxTimeSpan swig_types[43] +#define SWIGTYPE_p_wxArrayString swig_types[44] +#define SWIGTYPE_p_wxWindowDisabler swig_types[45] +#define SWIGTYPE_p_form_ops_t swig_types[46] +#define SWIGTYPE_p_wxToolTip swig_types[47] +#define SWIGTYPE_p_wxDataObjectComposite swig_types[48] +#define SWIGTYPE_p_wxSystemSettings swig_types[49] +#define SWIGTYPE_p_wxFileConfig swig_types[50] +#define SWIGTYPE_p_wxVideoMode swig_types[51] +#define SWIGTYPE_p_wxDataObjectSimple swig_types[52] +#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[53] +#define SWIGTYPE_p_wxDuplexMode swig_types[54] +#define SWIGTYPE_p_wxEvtHandler swig_types[55] +#define SWIGTYPE_p_wxRect swig_types[56] +#define SWIGTYPE_p_char swig_types[57] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[58] +#define SWIGTYPE_p_wxStandardPaths swig_types[59] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[60] +#define SWIGTYPE_p_wxFrame swig_types[61] +#define SWIGTYPE_p_wxTimer swig_types[62] +#define SWIGTYPE_p_wxPaperSize swig_types[63] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[64] #define SWIGTYPE_p_wxPyTipProvider swig_types[65] #define SWIGTYPE_p_wxTipProvider swig_types[66] #define SWIGTYPE_p_wxJoystick swig_types[67] #define SWIGTYPE_p_wxSystemOptions swig_types[68] -#define SWIGTYPE_p_wxPoint swig_types[69] -#define SWIGTYPE_p_wxJoystickEvent swig_types[70] -#define SWIGTYPE_p_wxCursor swig_types[71] -#define SWIGTYPE_p_wxObject swig_types[72] -#define SWIGTYPE_p_wxOutputStream swig_types[73] -#define SWIGTYPE_p_wxDateTime swig_types[74] -#define SWIGTYPE_p_wxPyDropSource swig_types[75] -#define SWIGTYPE_p_unsigned_long swig_types[76] -#define SWIGTYPE_p_wxLogBuffer swig_types[77] -#define SWIGTYPE_p_wxKillError swig_types[78] -#define SWIGTYPE_p_wxWindow swig_types[79] -#define SWIGTYPE_p_wxString swig_types[80] -#define SWIGTYPE_p_wxPyProcess swig_types[81] -#define SWIGTYPE_p_wxBitmap swig_types[82] -#define SWIGTYPE_unsigned_int swig_types[83] -#define SWIGTYPE_p_unsigned_int swig_types[84] -#define SWIGTYPE_p_wxConfig swig_types[85] -#define SWIGTYPE_p_unsigned_char swig_types[86] -#define SWIGTYPE_p_wxChar swig_types[87] -#define SWIGTYPE_p_wxBusyInfo swig_types[88] -#define SWIGTYPE_p_wxPyDropTarget swig_types[89] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[90] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[91] -#define SWIGTYPE_p_wxProcessEvent swig_types[92] -#define SWIGTYPE_p_wxPyLog swig_types[93] -#define SWIGTYPE_p_wxLogNull swig_types[94] -#define SWIGTYPE_p_wxColour swig_types[95] -#define SWIGTYPE_p_wxPyTimer swig_types[96] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[97] -#define SWIGTYPE_p_wxDateSpan swig_types[98] -static swig_type_info *swig_types[100]; +#define SWIGTYPE_p_wxPyArtProvider swig_types[69] +#define SWIGTYPE_p_wxPoint swig_types[70] +#define SWIGTYPE_p_wxJoystickEvent swig_types[71] +#define SWIGTYPE_p_wxCursor swig_types[72] +#define SWIGTYPE_p_wxObject swig_types[73] +#define SWIGTYPE_p_wxOutputStream swig_types[74] +#define SWIGTYPE_p_wxDateTime swig_types[75] +#define SWIGTYPE_p_wxPyDropSource swig_types[76] +#define SWIGTYPE_p_unsigned_long swig_types[77] +#define SWIGTYPE_p_wxLogBuffer swig_types[78] +#define SWIGTYPE_p_wxKillError swig_types[79] +#define SWIGTYPE_p_wxWindow swig_types[80] +#define SWIGTYPE_p_wxString swig_types[81] +#define SWIGTYPE_p_wxPyProcess swig_types[82] +#define SWIGTYPE_p_wxBitmap swig_types[83] +#define SWIGTYPE_unsigned_int swig_types[84] +#define SWIGTYPE_p_unsigned_int swig_types[85] +#define SWIGTYPE_p_wxConfig swig_types[86] +#define SWIGTYPE_p_unsigned_char swig_types[87] +#define SWIGTYPE_p_wxChar swig_types[88] +#define SWIGTYPE_p_wxBusyInfo swig_types[89] +#define SWIGTYPE_p_wxPyDropTarget swig_types[90] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[91] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[92] +#define SWIGTYPE_p_wxProcessEvent swig_types[93] +#define SWIGTYPE_p_wxPyLog swig_types[94] +#define SWIGTYPE_p_wxLogNull swig_types[95] +#define SWIGTYPE_p_wxColour swig_types[96] +#define SWIGTYPE_p_wxPyTimer swig_types[97] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[98] +#define SWIGTYPE_p_wxDateSpan swig_types[99] +static swig_type_info *swig_types[101]; /* -------- TYPES TABLE (END) -------- */ @@ -1458,7 +1459,7 @@ static swig_type_info *swig_types[100]; - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1561,7 +1562,7 @@ SWIG_Check_int(PyObject* obj) static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -2512,7 +2513,7 @@ static double wxConfigBase_ReadFloat(wxConfigBase *self,wxString const &key,doub return rv; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -2542,11 +2543,11 @@ static PyObject *DateTime_GetAmPmStrings(){ } #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -4049,7 +4050,7 @@ static PyObject *_wrap_GetOsDescription(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_GetFreeMemory(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - long result; + wxMemorySize result; char *kwnames[] = { NULL }; @@ -4057,13 +4058,15 @@ static PyObject *_wrap_GetFreeMemory(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetFreeMemory",kwnames)) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)wxGetFreeMemory(); + result = wxGetFreeMemory(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } { - resultobj = SWIG_From_long((long)(result)); + wxMemorySize * resultptr; + resultptr = new wxMemorySize((wxMemorySize &)(result)); + resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxMemorySize, 1); } return resultobj; fail: @@ -5461,117 +5464,6 @@ static PyObject *_wrap_MessageBox(PyObject *, PyObject *args, PyObject *kwargs) } -static PyObject *_wrap_GetNumberFromUser(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxString *arg1 = 0 ; - wxString *arg2 = 0 ; - wxString *arg3 = 0 ; - long arg4 ; - long arg5 = (long) 0 ; - long arg6 = (long) 100 ; - wxWindow *arg7 = (wxWindow *) NULL ; - wxPoint const &arg8_defvalue = wxDefaultPosition ; - wxPoint *arg8 = (wxPoint *) &arg8_defvalue ; - long result; - bool temp1 = false ; - bool temp2 = false ; - bool temp3 = false ; - wxPoint temp8 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - PyObject * obj4 = 0 ; - PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; - PyObject * obj7 = 0 ; - char *kwnames[] = { - (char *) "message",(char *) "prompt",(char *) "caption",(char *) "value",(char *) "min",(char *) "max",(char *) "parent",(char *) "pos", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOO:GetNumberFromUser",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail; - { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = true; - } - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - arg3 = wxString_in_helper(obj2); - if (arg3 == NULL) SWIG_fail; - temp3 = true; - } - { - arg4 = (long)(SWIG_As_long(obj3)); - if (SWIG_arg_fail(4)) SWIG_fail; - } - if (obj4) { - { - arg5 = (long)(SWIG_As_long(obj4)); - if (SWIG_arg_fail(5)) SWIG_fail; - } - } - if (obj5) { - { - arg6 = (long)(SWIG_As_long(obj5)); - if (SWIG_arg_fail(6)) SWIG_fail; - } - } - if (obj6) { - SWIG_Python_ConvertPtr(obj6, (void **)&arg7, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(7)) SWIG_fail; - } - if (obj7) { - { - arg8 = &temp8; - if ( ! wxPoint_helper(obj7, &arg8)) SWIG_fail; - } - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)wxGetNumberFromUser((wxString const &)*arg1,(wxString const &)*arg2,(wxString const &)*arg3,arg4,arg5,arg6,arg7,(wxPoint const &)*arg8); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_long((long)(result)); - } - { - if (temp1) - delete arg1; - } - { - if (temp2) - delete arg2; - } - { - if (temp3) - delete arg3; - } - return resultobj; - fail: - { - if (temp1) - delete arg1; - } - { - if (temp2) - delete arg2; - } - { - if (temp3) - delete arg3; - } - return NULL; -} - - static PyObject *_wrap_ColourDisplay(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; bool result; @@ -31719,7 +31611,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"GetSingleChoice", (PyCFunction) _wrap_GetSingleChoice, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetSingleChoiceIndex", (PyCFunction) _wrap_GetSingleChoiceIndex, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MessageBox", (PyCFunction) _wrap_MessageBox, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GetNumberFromUser", (PyCFunction) _wrap_GetNumberFromUser, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ColourDisplay", (PyCFunction) _wrap_ColourDisplay, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DisplayDepth", (PyCFunction) _wrap_DisplayDepth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GetDisplayDepth", (PyCFunction) _wrap_GetDisplayDepth, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33006,6 +32897,7 @@ static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConf static swig_type_info _swigt__p_wxDisplay[] = {{"_p_wxDisplay", 0, "wxDisplay *", 0, 0, 0, 0},{"_p_wxDisplay", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFileType[] = {{"_p_wxFileType", 0, "wxFileType *", 0, 0, 0, 0},{"_p_wxFileType", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxLogGui[] = {{"_p_wxLogGui", 0, "wxLogGui *", 0, 0, 0, 0},{"_p_wxLogGui", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxMemorySize[] = {{"_p_wxMemorySize", 0, "wxMemorySize *", 0, 0, 0, 0},{"_p_wxMemorySize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0, 0, 0, 0},{"_p_wxFont", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDataFormat[] = {{"_p_wxDataFormat", 0, "wxDataFormat *", 0, 0, 0, 0},{"_p_wxDataFormat", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTimerEvent[] = {{"_p_wxTimerEvent", 0, "wxTimerEvent *", 0, 0, 0, 0},{"_p_wxTimerEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -33058,11 +32950,11 @@ static swig_type_info _swigt__p_wxFrame[] = {{"_p_wxFrame", 0, "wxFrame *", 0, 0 static swig_type_info _swigt__p_wxTimer[] = {{"_p_wxTimer", 0, "wxTimer *", 0, 0, 0, 0},{"_p_wxTimer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPaperSize[] = {{"_p_wxPaperSize", 0, "enum wxPaperSize *|wxPaperSize *", 0, 0, 0, 0},{"_p_wxPaperSize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMimeTypesManager[] = {{"_p_wxMimeTypesManager", 0, "wxMimeTypesManager *", 0, 0, 0, 0},{"_p_wxMimeTypesManager", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxPyArtProvider[] = {{"_p_wxPyArtProvider", 0, "wxPyArtProvider *", 0, 0, 0, 0},{"_p_wxPyArtProvider", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTipProvider[] = {{"_p_wxPyTipProvider", 0, "wxPyTipProvider *", 0, 0, 0, 0},{"_p_wxPyTipProvider", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTipProvider[] = {{"_p_wxTipProvider", 0, "wxTipProvider *", 0, 0, 0, 0},{"_p_wxTipProvider", 0, 0, 0, 0, 0, 0},{"_p_wxPyTipProvider", _p_wxPyTipProviderTo_p_wxTipProvider, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxJoystick[] = {{"_p_wxJoystick", 0, "wxJoystick *", 0, 0, 0, 0},{"_p_wxJoystick", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxSystemOptions[] = {{"_p_wxSystemOptions", 0, "wxSystemOptions *", 0, 0, 0, 0},{"_p_wxSystemOptions", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxPyArtProvider[] = {{"_p_wxPyArtProvider", 0, "wxPyArtProvider *", 0, 0, 0, 0},{"_p_wxPyArtProvider", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxJoystickEvent[] = {{"_p_wxJoystickEvent", 0, "wxJoystickEvent *", 0, 0, 0, 0},{"_p_wxJoystickEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -33107,6 +32999,7 @@ _swigt__p_wxConfigBase, _swigt__p_wxDisplay, _swigt__p_wxFileType, _swigt__p_wxLogGui, +_swigt__p_wxMemorySize, _swigt__p_wxFont, _swigt__p_wxDataFormat, _swigt__p_wxTimerEvent, @@ -33159,11 +33052,11 @@ _swigt__p_wxFrame, _swigt__p_wxTimer, _swigt__p_wxPaperSize, _swigt__p_wxMimeTypesManager, -_swigt__p_wxPyArtProvider, _swigt__p_wxPyTipProvider, _swigt__p_wxTipProvider, _swigt__p_wxJoystick, _swigt__p_wxSystemOptions, +_swigt__p_wxPyArtProvider, _swigt__p_wxPoint, _swigt__p_wxJoystickEvent, _swigt__p_wxCursor, diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index b60e259d4f..33efcdfa90 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -421,19 +421,11 @@ class TopLevelWindow(_core.Window): return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs) def SetTitle(*args, **kwargs): - """ - SetTitle(self, String title) - - Sets the window's title. Applicable only to frames and dialogs. - """ + """SetTitle(self, String title)""" return _windows_.TopLevelWindow_SetTitle(*args, **kwargs) def GetTitle(*args, **kwargs): - """ - GetTitle(self) -> String - - Gets the window's title. Applicable only to frames and dialogs. - """ + """GetTitle(self) -> String""" return _windows_.TopLevelWindow_GetTitle(*args, **kwargs) def SetShape(*args, **kwargs): @@ -4047,78 +4039,6 @@ class PrintData(_core.Object): """SetPrivData(self, PyObject data)""" return _windows_.PrintData_SetPrivData(*args, **kwargs) - def GetPrinterCommand(*args, **kwargs): - """GetPrinterCommand(self) -> String""" - return _windows_.PrintData_GetPrinterCommand(*args, **kwargs) - - def GetPrinterOptions(*args, **kwargs): - """GetPrinterOptions(self) -> String""" - return _windows_.PrintData_GetPrinterOptions(*args, **kwargs) - - def GetPreviewCommand(*args, **kwargs): - """GetPreviewCommand(self) -> String""" - return _windows_.PrintData_GetPreviewCommand(*args, **kwargs) - - def GetFontMetricPath(*args, **kwargs): - """GetFontMetricPath(self) -> String""" - return _windows_.PrintData_GetFontMetricPath(*args, **kwargs) - - def GetPrinterScaleX(*args, **kwargs): - """GetPrinterScaleX(self) -> double""" - return _windows_.PrintData_GetPrinterScaleX(*args, **kwargs) - - def GetPrinterScaleY(*args, **kwargs): - """GetPrinterScaleY(self) -> double""" - return _windows_.PrintData_GetPrinterScaleY(*args, **kwargs) - - def GetPrinterTranslateX(*args, **kwargs): - """GetPrinterTranslateX(self) -> long""" - return _windows_.PrintData_GetPrinterTranslateX(*args, **kwargs) - - def GetPrinterTranslateY(*args, **kwargs): - """GetPrinterTranslateY(self) -> long""" - return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs) - - def SetPrinterCommand(*args, **kwargs): - """SetPrinterCommand(self, String command)""" - return _windows_.PrintData_SetPrinterCommand(*args, **kwargs) - - def SetPrinterOptions(*args, **kwargs): - """SetPrinterOptions(self, String options)""" - return _windows_.PrintData_SetPrinterOptions(*args, **kwargs) - - def SetPreviewCommand(*args, **kwargs): - """SetPreviewCommand(self, String command)""" - return _windows_.PrintData_SetPreviewCommand(*args, **kwargs) - - def SetFontMetricPath(*args, **kwargs): - """SetFontMetricPath(self, String path)""" - return _windows_.PrintData_SetFontMetricPath(*args, **kwargs) - - def SetPrinterScaleX(*args, **kwargs): - """SetPrinterScaleX(self, double x)""" - return _windows_.PrintData_SetPrinterScaleX(*args, **kwargs) - - def SetPrinterScaleY(*args, **kwargs): - """SetPrinterScaleY(self, double y)""" - return _windows_.PrintData_SetPrinterScaleY(*args, **kwargs) - - def SetPrinterScaling(*args, **kwargs): - """SetPrinterScaling(self, double x, double y)""" - return _windows_.PrintData_SetPrinterScaling(*args, **kwargs) - - def SetPrinterTranslateX(*args, **kwargs): - """SetPrinterTranslateX(self, long x)""" - return _windows_.PrintData_SetPrinterTranslateX(*args, **kwargs) - - def SetPrinterTranslateY(*args, **kwargs): - """SetPrinterTranslateY(self, long y)""" - return _windows_.PrintData_SetPrinterTranslateY(*args, **kwargs) - - def SetPrinterTranslation(*args, **kwargs): - """SetPrinterTranslation(self, long x, long y)""" - return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs) - class PrintDataPtr(PrintData): def __init__(self, this): @@ -4368,14 +4288,6 @@ class PrintDialogData(_core.Object): """GetPrintToFile(self) -> bool""" return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs) - def GetSetupDialog(*args, **kwargs): - """GetSetupDialog(self) -> bool""" - return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs) - - def SetSetupDialog(*args, **kwargs): - """SetSetupDialog(self, bool flag)""" - return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs) - def SetFromPage(*args, **kwargs): """SetFromPage(self, int v)""" return _windows_.PrintDialogData_SetFromPage(*args, **kwargs) diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 3f52f17b36..1eca9bcc41 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1615,7 +1615,7 @@ SWIG_Check_bool(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1683,7 +1683,7 @@ SWIG_Check_double(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ @@ -1694,7 +1694,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,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -21510,890 +21510,276 @@ static PyObject *_wrap_PrintData_SetPrivData(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject * PrintData_swigregister(PyObject *, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxPrintData, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; + wxPageSetupDialogData *result; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterCommand",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)":new_PageSetupDialogData")) goto fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxString const &_result_ref = (arg1)->GetPrinterCommand(); - result = (wxString *) &_result_ref; - } + result = (wxPageSetupDialogData *)new wxPageSetupDialogData(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); -#else - resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); -#endif - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetPrinterOptions(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *, PyObject *args) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *result; + wxPageSetupDialogData *arg1 = 0 ; + wxPageSetupDialogData *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterOptions",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxString const &_result_ref = (arg1)->GetPrinterOptions(); - result = (wxString *) &_result_ref; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (arg1 == NULL) { + SWIG_null_ref("wxPageSetupDialogData"); } + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPageSetupDialogData const &)*arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); -#else - resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); -#endif - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetPreviewCommand(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *, PyObject *args) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *result; + wxPrintData *arg1 = 0 ; + wxPageSetupDialogData *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPreviewCommand",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail; { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxString const &_result_ref = (arg1)->GetPreviewCommand(); - result = (wxString *) &_result_ref; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (arg1 == NULL) { + SWIG_null_ref("wxPrintData"); } + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); -#else - resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); -#endif - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetFontMetricPath(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; +static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + int ii; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetFontMetricPath",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 1); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 0) { + return _wrap_new_PageSetupDialogData__SWIG_0(self,args); + } + if (argc == 1) { + int _v; { - wxString const &_result_ref = (arg1)->GetFontMetricPath(); - result = (wxString *) &_result_ref; + void *ptr = 0; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPageSetupDialogData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = (ptr != 0); + } + } + if (_v) { + return _wrap_new_PageSetupDialogData__SWIG_1(self,args); } - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); -#else - resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); -#endif + if (argc == 1) { + int _v; + { + void *ptr = 0; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = (ptr != 0); + } + } + if (_v) { + return _wrap_new_PageSetupDialogData__SWIG_2(self,args); + } } - return resultobj; - fail: + + PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'"); return NULL; } -static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_PageSetupDialogData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - double result; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterScaleX",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PageSetupDialogData",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (double)(arg1)->GetPrinterScaleX(); + delete arg1; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = SWIG_From_double((double)(result)); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - double result; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + bool arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterScaleY",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (double)(arg1)->GetPrinterScaleY(); + (arg1)->EnableHelp(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = SWIG_From_double((double)(result)); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - long result; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + bool arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterTranslateX",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)(arg1)->GetPrinterTranslateX(); + (arg1)->EnableMargins(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = SWIG_From_long((long)(result)); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - long result; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + bool arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintData_GetPrinterTranslateY",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (long)(arg1)->GetPrinterTranslateY(); + (arg1)->EnableOrientation(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = SWIG_From_long((long)(result)); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = false ; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + bool arg2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "command", NULL + (char *) "self",(char *) "flag", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterCommand",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterCommand((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "options", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterOptions",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterOptions((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "command", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPreviewCommand",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPreviewCommand((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - wxString *arg2 = 0 ; - bool temp2 = false ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "path", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetFontMetricPath",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = wxString_in_helper(obj1); - if (arg2 == NULL) SWIG_fail; - temp2 = true; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetFontMetricPath((wxString const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - { - if (temp2) - delete arg2; - } - return resultobj; - fail: - { - if (temp2) - delete arg2; - } - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleX",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (double)(SWIG_As_double(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterScaleX(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - double arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleY",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (double)(SWIG_As_double(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterScaleY(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - double arg2 ; - double arg3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x",(char *) "y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterScaling",kwnames,&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (double)(SWIG_As_double(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - arg3 = (double)(SWIG_As_double(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterScaling(arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - long arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateX",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (long)(SWIG_As_long(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterTranslateX(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - long arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateY",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (long)(SWIG_As_long(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterTranslateY(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintData *arg1 = (wxPrintData *) 0 ; - long arg2 ; - long arg3 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "x",(char *) "y", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterTranslation",kwnames,&obj0,&obj1,&obj2)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (long)(SWIG_As_long(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - arg3 = (long)(SWIG_As_long(obj2)); - if (SWIG_arg_fail(3)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetPrinterTranslation(arg2,arg3); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject * PrintData_swigregister(PyObject *, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxPrintData, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *, PyObject *args) { - PyObject *resultobj; - wxPageSetupDialogData *result; - - if(!PyArg_ParseTuple(args,(char *)":new_PageSetupDialogData")) goto fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPageSetupDialogData *)new wxPageSetupDialogData(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *, PyObject *args) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = 0 ; - wxPageSetupDialogData *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail; - { - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (arg1 == NULL) { - SWIG_null_ref("wxPageSetupDialogData"); - } - if (SWIG_arg_fail(1)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPageSetupDialogData const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *, PyObject *args) { - PyObject *resultobj; - wxPrintData *arg1 = 0 ; - wxPageSetupDialogData *result; - PyObject * obj0 = 0 ; - - if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail; - { - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (arg1 == NULL) { - SWIG_null_ref("wxPrintData"); - } - if (SWIG_arg_fail(1)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[2]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 1); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if (argc == 0) { - return _wrap_new_PageSetupDialogData__SWIG_0(self,args); - } - if (argc == 1) { - int _v; - { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPageSetupDialogData, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } - } - if (_v) { - return _wrap_new_PageSetupDialogData__SWIG_1(self,args); - } - } - if (argc == 1) { - int _v; - { - void *ptr = 0; - if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = (ptr != 0); - } - } - if (_v) { - return _wrap_new_PageSetupDialogData__SWIG_2(self,args); - } - } - - PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'"); - return NULL; -} - - -static PyObject *_wrap_delete_PageSetupDialogData(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_PageSetupDialogData",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, 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_PageSetupDialogData_EnableHelp(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EnableHelp(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EnableMargins(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EnableOrientation(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->EnablePaper(arg2); + (arg1)->EnablePaper(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -23738,65 +23124,6 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *, PyObject *args } -static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; - bool result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PrintDialogData_GetSetupDialog",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxPrintDialogData const *)arg1)->GetSetupDialog(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSetupDialog",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetSetupDialog(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ; @@ -28515,24 +27842,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintData_GetPrivData", (PyCFunction) _wrap_PrintData_GetPrivData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintData_SetPrivData", (PyCFunction) _wrap_PrintData_SetPrivData, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterCommand", (PyCFunction) _wrap_PrintData_GetPrinterCommand, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterOptions", (PyCFunction) _wrap_PrintData_GetPrinterOptions, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPreviewCommand", (PyCFunction) _wrap_PrintData_GetPreviewCommand, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetFontMetricPath", (PyCFunction) _wrap_PrintData_GetFontMetricPath, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterScaleX", (PyCFunction) _wrap_PrintData_GetPrinterScaleX, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterScaleY", (PyCFunction) _wrap_PrintData_GetPrinterScaleY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterTranslateX", (PyCFunction) _wrap_PrintData_GetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_GetPrinterTranslateY", (PyCFunction) _wrap_PrintData_GetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterCommand", (PyCFunction) _wrap_PrintData_SetPrinterCommand, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterOptions", (PyCFunction) _wrap_PrintData_SetPrinterOptions, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPreviewCommand", (PyCFunction) _wrap_PrintData_SetPreviewCommand, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetFontMetricPath", (PyCFunction) _wrap_PrintData_SetFontMetricPath, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterScaleX", (PyCFunction) _wrap_PrintData_SetPrinterScaleX, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterScaleY", (PyCFunction) _wrap_PrintData_SetPrinterScaleY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterScaling", (PyCFunction) _wrap_PrintData_SetPrinterScaling, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterTranslateX", (PyCFunction) _wrap_PrintData_SetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterTranslateY", (PyCFunction) _wrap_PrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintData_SetPrinterTranslation", (PyCFunction) _wrap_PrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintData_swigregister", PrintData_swigregister, METH_VARARGS, NULL}, { (char *)"new_PageSetupDialogData", _wrap_new_PageSetupDialogData, METH_VARARGS, NULL}, { (char *)"delete_PageSetupDialogData", (PyCFunction) _wrap_delete_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -28584,8 +27893,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"PrintDialogData_GetSelection", (PyCFunction) _wrap_PrintDialogData_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintDialogData_GetCollate", (PyCFunction) _wrap_PrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintDialogData_GetPrintToFile", (PyCFunction) _wrap_PrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintDialogData_GetSetupDialog", (PyCFunction) _wrap_PrintDialogData_GetSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PrintDialogData_SetSetupDialog", (PyCFunction) _wrap_PrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintDialogData_SetFromPage", (PyCFunction) _wrap_PrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintDialogData_SetToPage", (PyCFunction) _wrap_PrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PrintDialogData_SetMinPage", (PyCFunction) _wrap_PrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp index 0afdad34fc..41d0b917c2 100644 --- a/wxPython/src/msw/calendar_wrap.cpp +++ b/wxPython/src/msw/calendar_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1382,7 +1382,7 @@ static swig_type_info *swig_types[26]; #include - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index 6b42142103..336cbf79c5 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1897,7 +1897,7 @@ SWIG_FromCharPtr(const char* cptr) #define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -2356,12 +2356,12 @@ static void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index e7bd92745a..45d80d87ce 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -1079,9 +1079,9 @@ class HtmlWindow(_windows.ScrolledWindow): """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)""" return _html.HtmlWindow_SetStandardFonts(*args, **kwargs) - def SetTitle(*args, **kwargs): - """SetTitle(self, String title)""" - return _html.HtmlWindow_SetTitle(*args, **kwargs) + def SetLabel(*args, **kwargs): + """SetLabel(self, String title)""" + return _html.HtmlWindow_SetLabel(*args, **kwargs) def SetBorders(*args, **kwargs): """SetBorders(self, int b)""" @@ -1488,39 +1488,6 @@ class HtmlBookRecordPtr(HtmlBookRecord): self.__class__ = HtmlBookRecord _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr) -class HtmlContentsItem(object): - """Proxy of C++ HtmlContentsItem class""" - def __init__(self): raise RuntimeError, "No constructor defined" - def __repr__(self): - return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def GetLevel(*args, **kwargs): - """GetLevel(self) -> int""" - return _html.HtmlContentsItem_GetLevel(*args, **kwargs) - - def GetID(*args, **kwargs): - """GetID(self) -> int""" - return _html.HtmlContentsItem_GetID(*args, **kwargs) - - def GetName(*args, **kwargs): - """GetName(self) -> String""" - return _html.HtmlContentsItem_GetName(*args, **kwargs) - - def GetPage(*args, **kwargs): - """GetPage(self) -> String""" - return _html.HtmlContentsItem_GetPage(*args, **kwargs) - - def GetBook(*args, **kwargs): - """GetBook(self) -> HtmlBookRecord""" - return _html.HtmlContentsItem_GetBook(*args, **kwargs) - - -class HtmlContentsItemPtr(HtmlContentsItem): - def __init__(self, this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = HtmlContentsItem -_html.HtmlContentsItem_swigregister(HtmlContentsItemPtr) - class HtmlSearchStatus(object): """Proxy of C++ HtmlSearchStatus class""" def __init__(self): raise RuntimeError, "No constructor defined" @@ -1546,10 +1513,6 @@ class HtmlSearchStatus(object): """GetName(self) -> String""" return _html.HtmlSearchStatus_GetName(*args, **kwargs) - def GetContentsItem(*args, **kwargs): - """GetContentsItem(self) -> HtmlContentsItem""" - return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs) - class HtmlSearchStatusPtr(HtmlSearchStatus): def __init__(self, this): @@ -1594,22 +1557,6 @@ class HtmlHelpData(object): """GetBookRecArray(self) -> wxHtmlBookRecArray""" return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs) - def GetContents(*args, **kwargs): - """GetContents(self) -> HtmlContentsItem""" - return _html.HtmlHelpData_GetContents(*args, **kwargs) - - def GetContentsCnt(*args, **kwargs): - """GetContentsCnt(self) -> int""" - return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs) - - def GetIndex(*args, **kwargs): - """GetIndex(self) -> HtmlContentsItem""" - return _html.HtmlHelpData_GetIndex(*args, **kwargs) - - def GetIndexCnt(*args, **kwargs): - """GetIndexCnt(self) -> int""" - return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs) - class HtmlHelpDataPtr(HtmlHelpData): def __init__(self, this): diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 11eb115304..4189a60087 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1387,22 +1387,21 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_p_wxHtmlSearchStatus swig_types[45] #define SWIGTYPE_std__ptrdiff_t swig_types[46] #define SWIGTYPE_ptrdiff_t swig_types[47] -#define SWIGTYPE_p_wxHtmlContentsItem swig_types[48] -#define SWIGTYPE_p_wxConfigBase swig_types[49] -#define SWIGTYPE_p_wxPrintData swig_types[50] -#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[51] -#define SWIGTYPE_p_wxFrame swig_types[52] -#define SWIGTYPE_p_wxHtmlRenderingState swig_types[53] -#define SWIGTYPE_p_wxPyHtmlFilter swig_types[54] -#define SWIGTYPE_p_wxHtmlFilter swig_types[55] -#define SWIGTYPE_p_wxHtmlCell swig_types[56] -#define SWIGTYPE_p_wxHtmlContainerCell swig_types[57] -#define SWIGTYPE_p_wxHtmlTag swig_types[58] -#define SWIGTYPE_p_int swig_types[59] -#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[60] -#define SWIGTYPE_p_unsigned_long swig_types[61] -#define SWIGTYPE_p_wxHtmlBookRecord swig_types[62] -static swig_type_info *swig_types[64]; +#define SWIGTYPE_p_wxConfigBase swig_types[48] +#define SWIGTYPE_p_wxPrintData swig_types[49] +#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[50] +#define SWIGTYPE_p_wxFrame swig_types[51] +#define SWIGTYPE_p_wxHtmlRenderingState swig_types[52] +#define SWIGTYPE_p_wxPyHtmlFilter swig_types[53] +#define SWIGTYPE_p_wxHtmlFilter swig_types[54] +#define SWIGTYPE_p_wxHtmlCell swig_types[55] +#define SWIGTYPE_p_wxHtmlContainerCell swig_types[56] +#define SWIGTYPE_p_wxHtmlTag swig_types[57] +#define SWIGTYPE_p_int swig_types[58] +#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[59] +#define SWIGTYPE_p_unsigned_long swig_types[60] +#define SWIGTYPE_p_wxHtmlBookRecord swig_types[61] +static swig_type_info *swig_types[63]; /* -------- TYPES TABLE (END) -------- */ @@ -1429,7 +1428,7 @@ static swig_type_info *swig_types[64]; static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1794,7 +1793,7 @@ SWIG_Check_unsigned_SS_int(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ @@ -1809,11 +1808,11 @@ SWIGINTERNSHORT PyObject* #if UINT_MAX < LONG_MAX -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_long /*@@*/ #else -/*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ +/*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long /*@@*/ #endif @@ -2064,11 +2063,6 @@ static void wxHtmlEasyPrinting_SetFonts(wxHtmlEasyPrinting *self,wxString normal if (temp) delete [] temp; } -static int wxHtmlContentsItem_GetLevel(wxHtmlContentsItem *self){ return self->m_Level; } -static int wxHtmlContentsItem_GetID(wxHtmlContentsItem *self){ return self->m_ID; } -static wxString wxHtmlContentsItem_GetName(wxHtmlContentsItem *self){ return self->m_Name; } -static wxString wxHtmlContentsItem_GetPage(wxHtmlContentsItem *self){ return self->m_Page; } -static wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return self->m_Book; } #ifdef __cplusplus extern "C" { #endif @@ -7969,7 +7963,7 @@ static PyObject *_wrap_HtmlWindow_SetStandardFonts(PyObject *, PyObject *args, P } -static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_HtmlWindow_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; wxString *arg2 = 0 ; @@ -7980,7 +7974,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject (char *) "self",(char *) "title", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetTitle",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetLabel",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyHtmlWindow, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -7990,7 +7984,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetTitle((wxString const &)*arg2); + (arg1)->SetLabel((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10780,159 +10774,6 @@ static PyObject * HtmlBookRecord_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlContentsItem_GetLevel",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlContentsItem, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxHtmlContentsItem_GetLevel(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlContentsItem_GetID",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlContentsItem, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)wxHtmlContentsItem_GetID(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ; - wxString result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlContentsItem_GetName",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlContentsItem, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxHtmlContentsItem_GetName(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ; - wxString result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlContentsItem_GetPage",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlContentsItem, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = wxHtmlContentsItem_GetPage(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { -#if wxUSE_UNICODE - resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); -#else - resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); -#endif - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ; - wxHtmlBookRecord *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlContentsItem_GetBook",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlContentsItem, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxHtmlBookRecord *)wxHtmlContentsItem_GetBook(arg1); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlBookRecord, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject * HtmlContentsItem_swigregister(PyObject *, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxHtmlContentsItem, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ; @@ -11080,32 +10921,6 @@ static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *, PyObject *args, PyOb } -static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ; - wxHtmlContentsItem *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlSearchStatus_GetContentsItem",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlSearchStatus, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxHtmlContentsItem *)(arg1)->GetContentsItem(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlContentsItem, 0); - return resultobj; - fail: - return NULL; -} - - static PyObject * HtmlSearchStatus_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -11360,114 +11175,6 @@ static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *, PyObject *args, } -static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; - wxHtmlContentsItem *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlHelpData_GetContents",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxHtmlContentsItem *)(arg1)->GetContents(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlContentsItem, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlHelpData_GetContentsCnt",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetContentsCnt(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; - wxHtmlContentsItem *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlHelpData_GetIndex",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxHtmlContentsItem *)(arg1)->GetIndex(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxHtmlContentsItem, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlHelpData_GetIndexCnt",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxHtmlHelpData, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->GetIndexCnt(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - static PyObject * HtmlHelpData_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -12615,7 +12322,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SetRelatedStatusBar", (PyCFunction) _wrap_HtmlWindow_SetRelatedStatusBar, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SetFonts", (PyCFunction) _wrap_HtmlWindow_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SetStandardFonts", (PyCFunction) _wrap_HtmlWindow_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlWindow_SetTitle", (PyCFunction) _wrap_HtmlWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"HtmlWindow_SetLabel", (PyCFunction) _wrap_HtmlWindow_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SetBorders", (PyCFunction) _wrap_HtmlWindow_SetBorders, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_SetBackgroundImage", (PyCFunction) _wrap_HtmlWindow_SetBackgroundImage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlWindow_ReadCustomization", (PyCFunction) _wrap_HtmlWindow_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -12689,18 +12396,11 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlBookRecord_SetStart", (PyCFunction) _wrap_HtmlBookRecord_SetStart, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlBookRecord_GetFullPath", (PyCFunction) _wrap_HtmlBookRecord_GetFullPath, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlBookRecord_swigregister", HtmlBookRecord_swigregister, METH_VARARGS, NULL}, - { (char *)"HtmlContentsItem_GetLevel", (PyCFunction) _wrap_HtmlContentsItem_GetLevel, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlContentsItem_GetID", (PyCFunction) _wrap_HtmlContentsItem_GetID, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlContentsItem_GetName", (PyCFunction) _wrap_HtmlContentsItem_GetName, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlContentsItem_GetPage", (PyCFunction) _wrap_HtmlContentsItem_GetPage, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlContentsItem_GetBook", (PyCFunction) _wrap_HtmlContentsItem_GetBook, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlContentsItem_swigregister", HtmlContentsItem_swigregister, METH_VARARGS, NULL}, { (char *)"HtmlSearchStatus_Search", (PyCFunction) _wrap_HtmlSearchStatus_Search, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlSearchStatus_IsActive", (PyCFunction) _wrap_HtmlSearchStatus_IsActive, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlSearchStatus_GetCurIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetCurIndex, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlSearchStatus_GetMaxIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetMaxIndex, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlSearchStatus_GetName", (PyCFunction) _wrap_HtmlSearchStatus_GetName, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlSearchStatus_GetContentsItem", (PyCFunction) _wrap_HtmlSearchStatus_GetContentsItem, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlSearchStatus_swigregister", HtmlSearchStatus_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlHelpData", (PyCFunction) _wrap_new_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_HtmlHelpData", (PyCFunction) _wrap_delete_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -12709,10 +12409,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlHelpData_FindPageByName", (PyCFunction) _wrap_HtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlHelpData_FindPageById", (PyCFunction) _wrap_HtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_HtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlHelpData_GetContents", (PyCFunction) _wrap_HtmlHelpData_GetContents, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlHelpData_GetContentsCnt", (PyCFunction) _wrap_HtmlHelpData_GetContentsCnt, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlHelpData_GetIndex", (PyCFunction) _wrap_HtmlHelpData_GetIndex, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"HtmlHelpData_GetIndexCnt", (PyCFunction) _wrap_HtmlHelpData_GetIndexCnt, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlHelpData_swigregister", HtmlHelpData_swigregister, METH_VARARGS, NULL}, { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"HtmlHelpFrame_GetData", (PyCFunction) _wrap_HtmlHelpFrame_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -12750,203 +12446,242 @@ static PyMethodDef SwigMethods[] = { static void *_p_wxDefaultHtmlRenderingStyleTo_p_wxHtmlRenderingStyle(void *x) { return (void *)((wxHtmlRenderingStyle *) ((wxDefaultHtmlRenderingStyle *) x)); } -static void *_p_wxHtmlContainerCellTo_p_wxHtmlCell(void *x) { - return (void *)((wxHtmlCell *) ((wxHtmlContainerCell *) x)); -} -static void *_p_wxHtmlWidgetCellTo_p_wxHtmlCell(void *x) { - return (void *)((wxHtmlCell *) ((wxHtmlWidgetCell *) x)); +static void *_p_wxHtmlWinParserTo_p_wxHtmlParser(void *x) { + return (void *)((wxHtmlParser *) ((wxHtmlWinParser *) x)); } -static void *_p_wxHtmlColourCellTo_p_wxHtmlCell(void *x) { - return (void *)((wxHtmlCell *) ((wxHtmlColourCell *) x)); +static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) ((wxScrolledWindow *) x)); } -static void *_p_wxHtmlWordCellTo_p_wxHtmlCell(void *x) { - return (void *)((wxHtmlCell *) ((wxHtmlWordCell *) x)); +static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) ((wxPyVScrolledWindow *) x)); } -static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) { - return (void *)((wxHtmlCell *) ((wxHtmlFontCell *) x)); +static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x)); } -static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x)); +static void *_p_wxPyHtmlWindowTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyHtmlWindow *) x)); } -static void *_p_wxMiniFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x)); +static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x)); } -static void *_p_wxPyPanelTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyPanel *) x)); +static void *_p_wxPyHtmlListBoxTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); } -static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); +static void *_p_wxPyPanelTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) ((wxPyPanel *) x)); } -static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxValidator *) x)); +static void *_p_wxPreviewCanvasTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPreviewCanvas *) x)); } -static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); +static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) ((wxPreviewControlBar *) x)); } -static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxMenu *) x)); +static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { + return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxPasswordEntryDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); +static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) { + return (void *)((wxScrolledWindow *) ((wxPyScrolledWindow *) x)); } -static void *_p_wxTextEntryDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x)); +static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) { + return (void *)((wxScrolledWindow *) ((wxPyHtmlWindow *) x)); } -static void *_p_wxSingleChoiceDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x)); +static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) { + return (void *)((wxScrolledWindow *) ((wxPreviewCanvas *) x)); } -static void *_p_wxMultiChoiceDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxMultiChoiceDialog *) x)); +static void *_p_wxSplashScreenTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x)); } -static void *_p_wxFileDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x)); +static void *_p_wxMiniFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x)); } -static void *_p_wxMessageDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x)); +static void *_p_wxPyPanelTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *) ((wxPyPanel *) x)); } -static void *_p_wxProgressDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxProgressDialog *) x)); +static void *_p_wxMenuBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMenuBar *) x)); } -static void *_p_wxFindReplaceDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); +static void *_p_wxFindReplaceDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } -static void *_p_wxPanelTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxPanel *) x)); +static void *_p_wxProgressDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxProgressDialog *) x)); } -static void *_p_wxStatusBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxStatusBar *) x)); +static void *_p_wxMessageDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x)); } -static void *_p_wxPyVScrolledWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyVScrolledWindow *) x)); +static void *_p_wxPasswordEntryDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); } -static void *_p_wxTipWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPopupWindow *)(wxPyPopupTransientWindow *) ((wxTipWindow *) x)); +static void *_p_wxTextEntryDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x)); } -static void *_p_wxPyPopupTransientWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPopupWindow *) ((wxPyPopupTransientWindow *) x)); +static void *_p_wxSingleChoiceDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x)); } -static void *_p_wxPopupWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxPopupWindow *) x)); +static void *_p_wxMultiChoiceDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxMultiChoiceDialog *) x)); } -static void *_p_wxSashLayoutWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxSashWindow *) ((wxSashLayoutWindow *) x)); +static void *_p_wxFileDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x)); } -static void *_p_wxSashWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxSashWindow *) x)); +static void *_p_wxPanelTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxPanel *) x)); } -static void *_p_wxSplitterWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxSplitterWindow *) x)); +static void *_p_wxStatusBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxStatusBar *) x)); } -static void *_p_wxSplashScreenWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxSplashScreenWindow *) x)); +static void *_p_wxPyVScrolledWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *) ((wxPyVScrolledWindow *) x)); } -static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxWindow *) x)); +static void *_p_wxTipWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPopupWindow *)(wxPyPopupTransientWindow *) ((wxTipWindow *) x)); } -static void *_p_wxScrolledWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxScrolledWindow *) x)); +static void *_p_wxPyPopupTransientWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPopupWindow *) ((wxPyPopupTransientWindow *) x)); } -static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxTopLevelWindow *) x)); +static void *_p_wxPopupWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxPopupWindow *) x)); } -static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x)); +static void *_p_wxSashLayoutWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxSashWindow *) ((wxSashLayoutWindow *) x)); } -static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +static void *_p_wxScrolledWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *) ((wxScrolledWindow *) x)); } -static void *_p_wxPyHtmlWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x)); +static void *_p_wxTopLevelWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxTopLevelWindow *) x)); } -static void *_p_wxControlTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); +static void *_p_wxSplashScreenWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxSplashScreenWindow *) x)); } -static void *_p_wxPreviewFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x)); +static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxSplitterWindow *) x)); } -static void *_p_wxPyPreviewFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); +static void *_p_wxSashWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxSashWindow *) x)); } -static void *_p_wxMDIChildFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMDIChildFrame *) x)); +static void *_p_wxMDIClientWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMDIClientWindow *) x)); } -static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxPyApp *) x)); +static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); } -static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); +static void *_p_wxPyHtmlWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x)); } -static void *_p_wxPyWindowTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *) ((wxPyWindow *) x)); +static void *_p_wxControlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxControl *) x)); } -static void *_p_wxPreviewCanvasTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x)); +static void *_p_wxPreviewFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x)); } -static void *_p_wxPyHtmlListBoxTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); +static void *_p_wxPyPreviewFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } -static void *_p_wxPyVListBoxTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *) ((wxPyVListBox *) x)); +static void *_p_wxMDIChildFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMDIChildFrame *) x)); } -static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPreviewControlBar *) x)); +static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); } -static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); +static void *_p_wxPyWindowTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxPyWindow *) x)); } -static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) ((wxPyTaskBarIcon *) x)); +static void *_p_wxPreviewCanvasTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x)); } -static void *_p_wxHtmlHelpFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxHtmlHelpFrame *) x)); +static void *_p_wxPyHtmlListBoxTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); } -static void *_p_wxFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x)); +static void *_p_wxPyVListBoxTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *) ((wxPyVListBox *) x)); } -static void *_p_wxDirDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxDirDialog *) x)); +static void *_p_wxPreviewControlBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *) ((wxPreviewControlBar *) x)); } -static void *_p_wxColourDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxColourDialog *) x)); +static void *_p_wxPyPreviewControlBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxDialog *) x)); +static void *_p_wxHtmlHelpFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxHtmlHelpFrame *) x)); } -static void *_p_wxFontDialogTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x)); +static void *_p_wxFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *) ((wxFrame *) x)); } -static void *_p_wxMDIParentFrameTo_p_wxEvtHandler(void *x) { - return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x)); +static void *_p_wxFontDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x)); } -static void *_p_wxPyHtmlWinTagHandlerTo_p_wxPyHtmlTagHandler(void *x) { - return (void *)((wxPyHtmlTagHandler *) ((wxPyHtmlWinTagHandler *) x)); +static void *_p_wxDirDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxDirDialog *) x)); } -static void *_p_wxMDIChildFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxMDIChildFrame *) x)); +static void *_p_wxColourDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxColourDialog *) x)); } -static void *_p_wxProgressDialogTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxProgressDialog *) x)); +static void *_p_wxDialogTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *) ((wxDialog *) x)); } -static void *_p_wxPreviewFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxPreviewFrame *) x)); +static void *_p_wxMDIParentFrameTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x)); } -static void *_p_wxPyPreviewFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) (wxPreviewFrame *) ((wxPyPreviewFrame *) x)); +static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) ((wxFrame *) x)); } -static void *_p_wxMiniFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxMiniFrame *) x)); +static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x)); } -static void *_p_wxHtmlHelpFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxHtmlHelpFrame *) x)); +static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x)); } -static void *_p_wxSplashScreenTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxSplashScreen *) x)); +static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x)); } -static void *_p_wxMDIParentFrameTo_p_wxFrame(void *x) { - return (void *)((wxFrame *) ((wxMDIParentFrame *) x)); +static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x)); } -static void *_p_wxHtmlPrintoutTo_p_wxPyPrintout(void *x) { - return (void *)((wxPyPrintout *) ((wxHtmlPrintout *) x)); +static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) ((wxDialog *) x)); +} +static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x)); +} +static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x)); +} +static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x)); +} +static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x)); +} +static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x)); +} +static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); +} +static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x)); +} +static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x)); +} +static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x)); +} +static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x)); +} +static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x)); +} +static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x)); +} +static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x)); +} +static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) { + return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); @@ -13410,242 +13145,203 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) ((wxFrame *) x)); -} -static void *_p_wxMiniFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMiniFrame *) x)); -} -static void *_p_wxFontDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFontDialog *) x)); -} -static void *_p_wxDirDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxDirDialog *) x)); -} -static void *_p_wxColourDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxColourDialog *) x)); -} -static void *_p_wxDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) ((wxDialog *) x)); -} -static void *_p_wxSplashScreenTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxSplashScreen *) x)); -} -static void *_p_wxMDIParentFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIParentFrame *) x)); -} -static void *_p_wxMDIChildFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxMDIChildFrame *) x)); -} -static void *_p_wxProgressDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxProgressDialog *) x)); -} -static void *_p_wxMessageDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMessageDialog *) x)); -} -static void *_p_wxPasswordEntryDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); -} -static void *_p_wxTextEntryDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxTextEntryDialog *) x)); -} -static void *_p_wxSingleChoiceDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxSingleChoiceDialog *) x)); +static void *_p_wxPyHtmlWinTagHandlerTo_p_wxPyHtmlTagHandler(void *x) { + return (void *)((wxPyHtmlTagHandler *) ((wxPyHtmlWinTagHandler *) x)); } -static void *_p_wxMultiChoiceDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxMultiChoiceDialog *) x)); +static void *_p_wxSplashScreenTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x)); } -static void *_p_wxFileDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFileDialog *) x)); +static void *_p_wxMiniFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x)); } -static void *_p_wxFindReplaceDialogTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxDialog *) ((wxFindReplaceDialog *) x)); +static void *_p_wxPyPanelTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyPanel *) x)); } -static void *_p_wxHtmlHelpFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxHtmlHelpFrame *) x)); +static void *_p_wxMenuBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxMenuBar *) x)); } -static void *_p_wxPreviewFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *) ((wxPreviewFrame *) x)); +static void *_p_wxValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxPyPreviewFrameTo_p_wxTopLevelWindow(void *x) { - return (void *)((wxTopLevelWindow *) (wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); +static void *_p_wxPyValidatorTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxValidator *) ((wxPyValidator *) x)); } -static void *_p_wxSplashScreenTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxSplashScreen *) x)); +static void *_p_wxMenuTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxMenu *) x)); } -static void *_p_wxMiniFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMiniFrame *) x)); +static void *_p_wxPasswordEntryDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); } -static void *_p_wxPyPanelTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *) ((wxPyPanel *) x)); +static void *_p_wxTextEntryDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x)); } -static void *_p_wxMenuBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMenuBar *) x)); +static void *_p_wxSingleChoiceDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x)); } -static void *_p_wxFindReplaceDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); +static void *_p_wxMultiChoiceDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxMultiChoiceDialog *) x)); } -static void *_p_wxProgressDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxProgressDialog *) x)); +static void *_p_wxFileDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x)); } -static void *_p_wxMessageDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x)); +static void *_p_wxMessageDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxMessageDialog *) x)); } -static void *_p_wxPasswordEntryDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *)(wxTextEntryDialog *) ((wxPasswordEntryDialog *) x)); +static void *_p_wxProgressDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxProgressDialog *) x)); } -static void *_p_wxTextEntryDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxTextEntryDialog *) x)); +static void *_p_wxFindReplaceDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFindReplaceDialog *) x)); } -static void *_p_wxSingleChoiceDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxSingleChoiceDialog *) x)); +static void *_p_wxPanelTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxPanel *) x)); } -static void *_p_wxMultiChoiceDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxMultiChoiceDialog *) x)); +static void *_p_wxStatusBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxStatusBar *) x)); } -static void *_p_wxFileDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFileDialog *) x)); +static void *_p_wxPyVScrolledWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPyVScrolledWindow *) x)); } -static void *_p_wxPanelTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxPanel *) x)); +static void *_p_wxTipWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPopupWindow *)(wxPyPopupTransientWindow *) ((wxTipWindow *) x)); } -static void *_p_wxStatusBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxStatusBar *) x)); +static void *_p_wxPyPopupTransientWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPopupWindow *) ((wxPyPopupTransientWindow *) x)); } -static void *_p_wxPyVScrolledWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *) ((wxPyVScrolledWindow *) x)); +static void *_p_wxPopupWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxPopupWindow *) x)); } -static void *_p_wxTipWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPopupWindow *)(wxPyPopupTransientWindow *) ((wxTipWindow *) x)); +static void *_p_wxSashLayoutWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxSashWindow *) ((wxSashLayoutWindow *) x)); } -static void *_p_wxPyPopupTransientWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPopupWindow *) ((wxPyPopupTransientWindow *) x)); +static void *_p_wxSashWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxSashWindow *) x)); } -static void *_p_wxPopupWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxPopupWindow *) x)); +static void *_p_wxSplitterWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxSplitterWindow *) x)); } -static void *_p_wxSashLayoutWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxSashWindow *) ((wxSashLayoutWindow *) x)); +static void *_p_wxSplashScreenWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxSplashScreenWindow *) x)); } -static void *_p_wxScrolledWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *) ((wxScrolledWindow *) x)); +static void *_p_wxWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxWindow *) x)); } -static void *_p_wxTopLevelWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxTopLevelWindow *) x)); +static void *_p_wxScrolledWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxScrolledWindow *) x)); } -static void *_p_wxSplashScreenWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxSplashScreenWindow *) x)); +static void *_p_wxTopLevelWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxTopLevelWindow *) x)); } -static void *_p_wxSplitterWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxSplitterWindow *) x)); +static void *_p_wxMDIClientWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxMDIClientWindow *) x)); } -static void *_p_wxSashWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxSashWindow *) x)); +static void *_p_wxPyScrolledWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); } -static void *_p_wxMDIClientWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMDIClientWindow *) x)); +static void *_p_wxPyHtmlWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x)); } -static void *_p_wxPyScrolledWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +static void *_p_wxControlTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxControl *) x)); } -static void *_p_wxPyHtmlWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPyHtmlWindow *) x)); +static void *_p_wxPreviewFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x)); } -static void *_p_wxControlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxControl *) x)); +static void *_p_wxPyPreviewFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } -static void *_p_wxPreviewFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxPreviewFrame *) x)); +static void *_p_wxMDIChildFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMDIChildFrame *) x)); } -static void *_p_wxPyPreviewFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *)(wxPreviewFrame *) ((wxPyPreviewFrame *) x)); +static void *_p_wxPyAppTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyApp *) x)); } -static void *_p_wxMDIChildFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMDIChildFrame *) x)); +static void *_p_wxControlWithItemsTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxControl *) ((wxControlWithItems *) x)); } -static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +static void *_p_wxPyWindowTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *) ((wxPyWindow *) x)); } -static void *_p_wxPyWindowTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxPyWindow *) x)); +static void *_p_wxPreviewCanvasTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x)); } -static void *_p_wxPreviewCanvasTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x)); +static void *_p_wxPyHtmlListBoxTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); } -static void *_p_wxPyHtmlListBoxTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); +static void *_p_wxPyVListBoxTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *) ((wxPyVListBox *) x)); } -static void *_p_wxPyVListBoxTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxPyVScrolledWindow *) ((wxPyVListBox *) x)); +static void *_p_wxPreviewControlBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *) ((wxPreviewControlBar *) x)); } -static void *_p_wxPreviewControlBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *) ((wxPreviewControlBar *) x)); +static void *_p_wxPyPreviewControlBarTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); } -static void *_p_wxPyPreviewControlBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxPanel *)(wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); +static void *_p_wxPyTaskBarIconTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) ((wxPyTaskBarIcon *) x)); } -static void *_p_wxHtmlHelpFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxHtmlHelpFrame *) x)); +static void *_p_wxHtmlHelpFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxHtmlHelpFrame *) x)); } -static void *_p_wxFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *) ((wxFrame *) x)); +static void *_p_wxFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxFrame *) x)); } -static void *_p_wxFontDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x)); +static void *_p_wxDirDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxDirDialog *) x)); } -static void *_p_wxDirDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxDirDialog *) x)); +static void *_p_wxColourDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxColourDialog *) x)); } -static void *_p_wxColourDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxDialog *) ((wxColourDialog *) x)); +static void *_p_wxDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *) ((wxDialog *) x)); } -static void *_p_wxDialogTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *) ((wxDialog *) x)); +static void *_p_wxFontDialogTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxDialog *) ((wxFontDialog *) x)); } -static void *_p_wxMDIParentFrameTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x)); +static void *_p_wxMDIParentFrameTo_p_wxEvtHandler(void *x) { + return (void *)((wxEvtHandler *) (wxWindow *)(wxTopLevelWindow *)(wxFrame *) ((wxMDIParentFrame *) x)); } -static void *_p_wxPyScrolledWindowTo_p_wxScrolledWindow(void *x) { - return (void *)((wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +static void *_p_wxHtmlPrintoutTo_p_wxPyPrintout(void *x) { + return (void *)((wxPyPrintout *) ((wxHtmlPrintout *) x)); } -static void *_p_wxPyHtmlWindowTo_p_wxScrolledWindow(void *x) { - return (void *)((wxScrolledWindow *) ((wxPyHtmlWindow *) x)); +static void *_p_wxMDIChildFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxMDIChildFrame *) x)); } -static void *_p_wxPreviewCanvasTo_p_wxScrolledWindow(void *x) { - return (void *)((wxScrolledWindow *) ((wxPreviewCanvas *) x)); +static void *_p_wxProgressDialogTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxProgressDialog *) x)); } -static void *_p_wxScrolledWindowTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) ((wxScrolledWindow *) x)); +static void *_p_wxPreviewFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxPreviewFrame *) x)); } -static void *_p_wxPyVScrolledWindowTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) ((wxPyVScrolledWindow *) x)); +static void *_p_wxPyPreviewFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) (wxPreviewFrame *) ((wxPyPreviewFrame *) x)); } -static void *_p_wxPyScrolledWindowTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyScrolledWindow *) x)); +static void *_p_wxMiniFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxMiniFrame *) x)); } -static void *_p_wxPyHtmlWindowTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPyHtmlWindow *) x)); +static void *_p_wxHtmlHelpFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxHtmlHelpFrame *) x)); } -static void *_p_wxPyVListBoxTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxPyVScrolledWindow *) ((wxPyVListBox *) x)); +static void *_p_wxSplashScreenTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxSplashScreen *) x)); } -static void *_p_wxPyHtmlListBoxTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x)); +static void *_p_wxMDIParentFrameTo_p_wxFrame(void *x) { + return (void *)((wxFrame *) ((wxMDIParentFrame *) x)); } -static void *_p_wxPyPanelTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) ((wxPyPanel *) x)); +static void *_p_wxHtmlContainerCellTo_p_wxHtmlCell(void *x) { + return (void *)((wxHtmlCell *) ((wxHtmlContainerCell *) x)); } -static void *_p_wxPreviewCanvasTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxScrolledWindow *) ((wxPreviewCanvas *) x)); +static void *_p_wxHtmlWidgetCellTo_p_wxHtmlCell(void *x) { + return (void *)((wxHtmlCell *) ((wxHtmlWidgetCell *) x)); } -static void *_p_wxPreviewControlBarTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) ((wxPreviewControlBar *) x)); +static void *_p_wxHtmlColourCellTo_p_wxHtmlCell(void *x) { + return (void *)((wxHtmlCell *) ((wxHtmlColourCell *) x)); } -static void *_p_wxPyPreviewControlBarTo_p_wxPanel(void *x) { - return (void *)((wxPanel *) (wxPreviewControlBar *) ((wxPyPreviewControlBar *) x)); +static void *_p_wxHtmlWordCellTo_p_wxHtmlCell(void *x) { + return (void *)((wxHtmlCell *) ((wxHtmlWordCell *) x)); } -static void *_p_wxHtmlWinParserTo_p_wxHtmlParser(void *x) { - return (void *)((wxHtmlParser *) ((wxHtmlWinParser *) x)); +static void *_p_wxHtmlFontCellTo_p_wxHtmlCell(void *x) { + return (void *)((wxHtmlCell *) ((wxHtmlFontCell *) x)); } static swig_type_info _swigt__p_wxHtmlDCRenderer[] = {{"_p_wxHtmlDCRenderer", 0, "wxHtmlDCRenderer *", 0, 0, 0, 0},{"_p_wxHtmlDCRenderer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -13695,7 +13391,6 @@ static swig_type_info _swigt__p_wxHtmlPrintout[] = {{"_p_wxHtmlPrintout", 0, "wx static swig_type_info _swigt__p_wxHtmlSearchStatus[] = {{"_p_wxHtmlSearchStatus", 0, "wxHtmlSearchStatus *", 0, 0, 0, 0},{"_p_wxHtmlSearchStatus", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__std__ptrdiff_t[] = {{"_std__ptrdiff_t", 0, "std::ptrdiff_t", 0, 0, 0, 0},{"_std__ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxHtmlContentsItem[] = {{"_p_wxHtmlContentsItem", 0, "wxHtmlContentsItem *", 0, 0, 0, 0},{"_p_wxHtmlContentsItem", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0, 0, 0, 0},{"_p_wxConfigBase", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPrintData[] = {{"_p_wxPrintData", 0, "wxPrintData *", 0, 0, 0, 0},{"_p_wxPrintData", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxHtmlHelpFrame[] = {{"_p_wxHtmlHelpFrame", 0, "wxHtmlHelpFrame *", 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -13760,7 +13455,6 @@ _swigt__p_wxHtmlPrintout, _swigt__p_wxHtmlSearchStatus, _swigt__std__ptrdiff_t, _swigt__ptrdiff_t, -_swigt__p_wxHtmlContentsItem, _swigt__p_wxConfigBase, _swigt__p_wxPrintData, _swigt__p_wxHtmlHelpFrame, diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp index 57c113acaf..366b7295a3 100644 --- a/wxPython/src/msw/media_wrap.cpp +++ b/wxPython/src/msw/media_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1446,7 +1446,7 @@ const wxEventType wxEVT_MEDIA_STOP = 0; #endif - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1565,7 +1565,7 @@ SWIG_Check_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble /*@@*/ diff --git a/wxPython/src/msw/webkit_wrap.cpp b/wxPython/src/msw/webkit_wrap.cpp index 722dd84ce4..f047d88ffc 100644 --- a/wxPython/src/msw/webkit_wrap.cpp +++ b/wxPython/src/msw/webkit_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1567,7 +1567,7 @@ SWIG_Check_long(PyObject* obj) } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,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 ea0bcbd588..a93bfd468c 100644 --- a/wxPython/src/msw/wizard_wrap.cpp +++ b/wxPython/src/msw/wizard_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1389,7 +1389,7 @@ static swig_type_info *swig_types[30]; static const wxString wxPyEmptyString(wxEmptyString); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp index de198811ab..2e2a14919f 100644 --- a/wxPython/src/msw/xrc_wrap.cpp +++ b/wxPython/src/msw/xrc_wrap.cpp @@ -593,7 +593,7 @@ typedef struct swig_const_info { #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Python_ConvertPtr(obj, pp, type, flags) #define SWIG_NewPointerObj(p, type, flags) SWIG_Python_NewPointerObj(p, type, flags) #define SWIG_MustGetPtr(p, type, argnum, flags) SWIG_Python_MustGetPtr(p, type, argnum, flags) - + /* Python-specific SWIG API */ #define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) SWIG_Python_ConvertPacked(obj, ptr, sz, ty, flags) @@ -654,7 +654,7 @@ PySwigObject_print(PySwigObject *v, FILE *fp, int flags) return 1; } } - + SWIGRUNTIME PyObject * PySwigObject_repr(PySwigObject *v) { @@ -720,7 +720,7 @@ SWIGRUNTIME PyTypeObject* PySwigObject_GetType() { static char PySwigObject_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; - + static PyNumberMethods PySwigObject_as_number = { (binaryfunc)0, /*nb_add*/ (binaryfunc)0, /*nb_subtract*/ @@ -854,7 +854,7 @@ PySwigPacked_print(PySwigPacked *v, FILE *fp, int flags) fputs(">", fp); return 0; } - + SWIGRUNTIME PyObject * PySwigPacked_repr(PySwigPacked *v) { @@ -903,7 +903,7 @@ PySwigPacked_GetType() { static char PySwigPacked_Type__doc__[] = "Swig object carries a C/C++ instance pointer"; static int type_init = 0; - + static PyTypeObject PySwigPacked_Type; if (!type_init) { PyTypeObject tmp = { @@ -950,8 +950,8 @@ PySwigPacked_GetType() { PySwigPacked_Type = tmp; type_init = 1; } - - + + return &PySwigPacked_Type; } @@ -1110,7 +1110,7 @@ SWIG_Python_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) int newref = 0; PyObject *pyobj = 0; void *vptr; - + if (!obj) return 0; if (obj == Py_None) { *ptr = 0; @@ -1399,7 +1399,7 @@ static swig_type_info *swig_types[33]; static const wxString wxPyIconString(wxT("icon")); static const wxString wxPyFontString(wxT("font")); - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -1520,7 +1520,7 @@ static bool wxXmlResource_LoadFromString(wxXmlResource *self,wxString const &dat return retval; } - /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ + /*@C:\\SWIG-1.3.24\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_long PyInt_FromLong /*@@*/ diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py index 08a2eed7b0..36a950ec73 100644 --- a/wxPython/wxPython/_controls.py +++ b/wxPython/wxPython/_controls.py @@ -259,10 +259,6 @@ wxChoicebookEvent = wx._controls.ChoicebookEvent wxChoicebookEventPtr = wx._controls.ChoicebookEventPtr wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING -wxBookCtrlSizer = wx._controls.BookCtrlSizer -wxBookCtrlSizerPtr = wx._controls.BookCtrlSizerPtr -wxNotebookSizer = wx._controls.NotebookSizer -wxNotebookSizerPtr = wx._controls.NotebookSizerPtr wxTOOL_STYLE_BUTTON = wx._controls.TOOL_STYLE_BUTTON wxTOOL_STYLE_SEPARATOR = wx._controls.TOOL_STYLE_SEPARATOR wxTOOL_STYLE_CONTROL = wx._controls.TOOL_STYLE_CONTROL @@ -380,8 +376,6 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_LIST_COL_BEGIN_DR wxEVT_COMMAND_LIST_COL_DRAGGING = wx._controls.wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_COMMAND_LIST_COL_END_DRAG = wx._controls.wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_COMMAND_LIST_ITEM_FOCUSED = wx._controls.wxEVT_COMMAND_LIST_ITEM_FOCUSED -wxEVT_COMMAND_LIST_GET_INFO = wx._controls.wxEVT_COMMAND_LIST_GET_INFO -wxEVT_COMMAND_LIST_SET_INFO = wx._controls.wxEVT_COMMAND_LIST_SET_INFO wxListCtrl = wx._controls.ListCtrl wxListCtrlPtr = wx._controls.ListCtrlPtr wxListCtrl = wx._controls.ListCtrl diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py index f12f0ef33d..d1bf8af940 100644 --- a/wxPython/wxPython/_core.py +++ b/wxPython/wxPython/_core.py @@ -735,6 +735,10 @@ wxImageHandlerPtr = wx._core.ImageHandlerPtr wxImageHistogram = wx._core.ImageHistogram wxImageHistogramPtr = wx._core.ImageHistogramPtr wxImageHistogram_MakeKey = wx._core.ImageHistogram_MakeKey +wxImage_RGBValue = wx._core.Image_RGBValue +wxImage_RGBValuePtr = wx._core.Image_RGBValuePtr +wxImage_HSVValue = wx._core.Image_HSVValue +wxImage_HSVValuePtr = wx._core.Image_HSVValuePtr wxImage = wx._core.Image wxImagePtr = wx._core.ImagePtr wxImageFromMime = wx._core.ImageFromMime @@ -751,6 +755,8 @@ wxImage_AddHandler = wx._core.Image_AddHandler wxImage_InsertHandler = wx._core.Image_InsertHandler wxImage_RemoveHandler = wx._core.Image_RemoveHandler wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard +wxImage_RGBtoHSV = wx._core.Image_RGBtoHSV +wxImage_HSVtoRGB = wx._core.Image_HSVtoRGB wxNullImage = wx._core.NullImage wxIMAGE_OPTION_FILENAME = wx._core.IMAGE_OPTION_FILENAME wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py index 91d64c95c8..e23baea3fe 100644 --- a/wxPython/wxPython/_misc.py +++ b/wxPython/wxPython/_misc.py @@ -173,7 +173,6 @@ wxGetPasswordFromUser = wx._misc.GetPasswordFromUser wxGetSingleChoice = wx._misc.GetSingleChoice wxGetSingleChoiceIndex = wx._misc.GetSingleChoiceIndex wxMessageBox = wx._misc.MessageBox -wxGetNumberFromUser = wx._misc.GetNumberFromUser wxColourDisplay = wx._misc.ColourDisplay wxDisplayDepth = wx._misc.DisplayDepth wxGetDisplayDepth = wx._misc.GetDisplayDepth diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py index ddc237e28c..4a4956cd09 100644 --- a/wxPython/wxPython/html.py +++ b/wxPython/wxPython/html.py @@ -123,8 +123,6 @@ wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr wxHtmlBookRecord = wx.html.HtmlBookRecord wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr -wxHtmlContentsItem = wx.html.HtmlContentsItem -wxHtmlContentsItemPtr = wx.html.HtmlContentsItemPtr wxHtmlSearchStatus = wx.html.HtmlSearchStatus wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr wxHtmlHelpData = wx.html.HtmlHelpData