From 3ecece7e042ddd7a8968ddccdf6dd4e982b5a15a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 26 Oct 2006 15:22:43 +0000 Subject: [PATCH] Fixed some (out) typemaps git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gizmos.i | 5 ++++ wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 23 +++++++++------- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 23 +++++++++------- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 23 +++++++++------- wxPython/distrib/all/do-build-windows | 16 +++++++----- wxPython/src/_event.i | 5 ++++ wxPython/src/_filesys.i | 6 +++++ wxPython/src/_image.i | 1 + wxPython/src/_imaglist.i | 6 +++++ wxPython/src/_listctrl.i | 11 ++++++++ wxPython/src/_menu.i | 7 +++++ wxPython/src/_misc.i | 3 ++- wxPython/src/gtk/_controls_wrap.cpp | 26 +++++++++++------- wxPython/src/gtk/_core_wrap.cpp | 12 +++------ wxPython/src/gtk/_misc.py | 2 ++ wxPython/src/gtk/_misc_wrap.cpp | 29 +++++++++++++++++++++ wxPython/src/gtk/html_wrap.cpp | 4 +-- wxPython/src/mac/_controls_wrap.cpp | 26 +++++++++++------- wxPython/src/mac/_core_wrap.cpp | 12 +++------ wxPython/src/mac/_misc.py | 2 ++ wxPython/src/mac/_misc_wrap.cpp | 29 +++++++++++++++++++++ wxPython/src/mac/html_wrap.cpp | 4 +-- wxPython/src/msw/_controls_wrap.cpp | 26 +++++++++++------- wxPython/src/msw/_core_wrap.cpp | 12 +++------ wxPython/src/msw/_misc.py | 2 ++ wxPython/src/msw/_misc_wrap.cpp | 29 +++++++++++++++++++++ wxPython/src/msw/html_wrap.cpp | 4 +-- wxPython/src/my_typemaps.i | 5 ++-- 28 files changed, 252 insertions(+), 101 deletions(-) diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i index 65ddbbc35a..7522e3d549 100644 --- a/wxPython/contrib/gizmos/gizmos.i +++ b/wxPython/contrib/gizmos/gizmos.i @@ -172,6 +172,11 @@ enum { wxEL_ALLOW_DELETE, }; + +%typemap(out) wxPyListCtrl* +{ $result = wxPyMake_wxObject((wxObject*)$1, (bool)$owner); } + + // This class provides a composite control that lets the // user easily enter list of strings MustHaveApp(wxEditableListBox); diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index daf46bc01e..d78e93fced 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -3859,7 +3859,9 @@ SWIGINTERN PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *SWIGUNUSEDPARM( wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyListCtrl, 0 | 0 ); + { + resultobj = wxPyMake_wxObject((wxObject*)result, (bool)0); + } return resultobj; fail: return NULL; @@ -6188,7 +6190,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6216,7 +6220,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *SWIGUNUSEDPA wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6244,7 +6250,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *SWIGUNUSED wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -12087,9 +12095,6 @@ static void *_p_wxStaticPictureTo_p_wxControl(void *x) { static void *_p_wxTextCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxTextCtrl *) x)); } -static void *_p_wxListViewTo_p_wxPyListCtrl(void *x) { - return (void *)((wxPyListCtrl *) ((wxListView *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -13354,6 +13359,7 @@ static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxComboBox = {"_p_wxComboBox", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGenericDirCtrl = {"_p_wxGenericDirCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxControlWithItems = {"_p_wxControlWithItems", 0, 0, 0, 0, 0}; @@ -13519,7 +13525,6 @@ static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPanel = {"_p_wxPanel", "wxPanel *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPaperSize = {"_p_wxPaperSize", "enum wxPaperSize *|wxPaperSize *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", "wxPyListCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow = {"_p_wxPyTreeCompanionWindow", "wxPyTreeCompanionWindow *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCtrl = {"_p_wxPyTreeCtrl", "wxPyTreeCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeItemData = {"_p_wxPyTreeItemData", "wxPyTreeItemData *", 0, 0, (void*)0, 0}; @@ -13817,6 +13822,7 @@ static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0} static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPyListCtrl[] = {{&_swigt__p_wxPyListCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxComboBox[] = {{&_swigt__p_wxComboBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = {{&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}}; @@ -13983,7 +13989,6 @@ static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarTool static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPickerBase, _p_wxPickerBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerEvent, _p_wxFontPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDirPickerEvent, _p_wxFileDirPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerEvent, _p_wxColourPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkCtrl, _p_wxHyperlinkCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerCtrl, _p_wxFontPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirPickerCtrl, _p_wxDirPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxFilePickerCtrl, _p_wxFilePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerCtrl, _p_wxColourPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkEvent, _p_wxHyperlinkEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCompanionWindow[] = { {&_swigt__p_wxPyTreeCompanionWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCtrl[] = { {&_swigt__p_wxPyTreeCtrl, 0, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeItemData[] = { {&_swigt__p_wxPyTreeItemData, 0, 0, 0},{0, 0, 0, 0}}; diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 580d5a7074..5b08baacef 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -3859,7 +3859,9 @@ SWIGINTERN PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *SWIGUNUSEDPARM( wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyListCtrl, 0 | 0 ); + { + resultobj = wxPyMake_wxObject((wxObject*)result, (bool)0); + } return resultobj; fail: return NULL; @@ -6188,7 +6190,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6216,7 +6220,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *SWIGUNUSEDPA wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6244,7 +6250,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *SWIGUNUSED wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -12087,9 +12095,6 @@ static void *_p_wxStaticPictureTo_p_wxControl(void *x) { static void *_p_wxTextCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxTextCtrl *) x)); } -static void *_p_wxListViewTo_p_wxPyListCtrl(void *x) { - return (void *)((wxPyListCtrl *) ((wxListView *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -13354,6 +13359,7 @@ static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxComboBox = {"_p_wxComboBox", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGenericDirCtrl = {"_p_wxGenericDirCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxControlWithItems = {"_p_wxControlWithItems", 0, 0, 0, 0, 0}; @@ -13519,7 +13525,6 @@ static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPanel = {"_p_wxPanel", "wxPanel *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPaperSize = {"_p_wxPaperSize", "enum wxPaperSize *|wxPaperSize *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", "wxPyListCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow = {"_p_wxPyTreeCompanionWindow", "wxPyTreeCompanionWindow *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCtrl = {"_p_wxPyTreeCtrl", "wxPyTreeCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeItemData = {"_p_wxPyTreeItemData", "wxPyTreeItemData *", 0, 0, (void*)0, 0}; @@ -13817,6 +13822,7 @@ static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0} static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPyListCtrl[] = {{&_swigt__p_wxPyListCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxComboBox[] = {{&_swigt__p_wxComboBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = {{&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}}; @@ -13983,7 +13989,6 @@ static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarTool static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPickerBase, _p_wxPickerBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerEvent, _p_wxFontPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDirPickerEvent, _p_wxFileDirPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerEvent, _p_wxColourPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkCtrl, _p_wxHyperlinkCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerCtrl, _p_wxFontPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirPickerCtrl, _p_wxDirPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxFilePickerCtrl, _p_wxFilePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerCtrl, _p_wxColourPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkEvent, _p_wxHyperlinkEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCompanionWindow[] = { {&_swigt__p_wxPyTreeCompanionWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCtrl[] = { {&_swigt__p_wxPyTreeCtrl, 0, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeItemData[] = { {&_swigt__p_wxPyTreeItemData, 0, 0, 0},{0, 0, 0, 0}}; diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index c1c0f0d577..a5bd06a0e2 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -3859,7 +3859,9 @@ SWIGINTERN PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *SWIGUNUSEDPARM( wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxPyListCtrl, 0 | 0 ); + { + resultobj = wxPyMake_wxObject((wxObject*)result, (bool)0); + } return resultobj; fail: return NULL; @@ -6188,7 +6190,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6216,7 +6220,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *SWIGUNUSEDPA wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -6244,7 +6250,9 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *SWIGUNUSED wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -12087,9 +12095,6 @@ static void *_p_wxStaticPictureTo_p_wxControl(void *x) { static void *_p_wxTextCtrlTo_p_wxControl(void *x) { return (void *)((wxControl *) ((wxTextCtrl *) x)); } -static void *_p_wxListViewTo_p_wxPyListCtrl(void *x) { - return (void *)((wxPyListCtrl *) ((wxListView *) x)); -} static void *_p_wxContextMenuEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) (wxCommandEvent *) ((wxContextMenuEvent *) x)); } @@ -13354,6 +13359,7 @@ static swig_type_info _swigt__p_wxToolbook = {"_p_wxToolbook", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPyControl = {"_p_wxPyControl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxToolBarBase = {"_p_wxToolBarBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxDirFilterListCtrl = {"_p_wxDirFilterListCtrl", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxComboBox = {"_p_wxComboBox", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGenericDirCtrl = {"_p_wxGenericDirCtrl", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxControlWithItems = {"_p_wxControlWithItems", 0, 0, 0, 0, 0}; @@ -13519,7 +13525,6 @@ static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, static swig_type_info _swigt__p_wxToolBarToolBase = {"_p_wxToolBarToolBase", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPanel = {"_p_wxPanel", "wxPanel *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPaperSize = {"_p_wxPaperSize", "enum wxPaperSize *|wxPaperSize *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxPyListCtrl = {"_p_wxPyListCtrl", "wxPyListCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow = {"_p_wxPyTreeCompanionWindow", "wxPyTreeCompanionWindow *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeCtrl = {"_p_wxPyTreeCtrl", "wxPyTreeCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyTreeItemData = {"_p_wxPyTreeItemData", "wxPyTreeItemData *", 0, 0, (void*)0, 0}; @@ -13817,6 +13822,7 @@ static swig_cast_info _swigc__p_wxToolbook[] = {{&_swigt__p_wxToolbook, 0, 0, 0} static swig_cast_info _swigc__p_wxPyControl[] = {{&_swigt__p_wxPyControl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxToolBarBase[] = {{&_swigt__p_wxToolBarBase, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxDirFilterListCtrl[] = {{&_swigt__p_wxDirFilterListCtrl, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxPyListCtrl[] = {{&_swigt__p_wxPyListCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxComboBox[] = {{&_swigt__p_wxComboBox, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGenericDirCtrl[] = {{&_swigt__p_wxGenericDirCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}}; @@ -13983,7 +13989,6 @@ static swig_cast_info _swigc__p_wxToolBarToolBase[] = {{&_swigt__p_wxToolBarTool static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxScrollBar, _p_wxScrollBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindDialogEvent, _p_wxFindDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarBase, _p_wxToolBarBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDragImage, _p_wxGenericDragImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBitmap, _p_wxStaticBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxComboBox, _p_wxComboBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTaskBarIcon, _p_wxPyTaskBarIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutAlgorithm, _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebook, _p_wxTreebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebook, _p_wxNotebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxListItem, _p_wxListItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebook, _p_wxChoicebookTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBase, _p_wxBookCtrlBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCtrl, _p_wxPyTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceData, _p_wxFindReplaceDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticLine, _p_wxStaticLineTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBookCtrlBaseEvent, _p_wxBookCtrlBaseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeEvent, _p_wxTreeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextUrlEvent, _p_wxTextUrlEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialogData, _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialogData, _p_wxPrintDialogDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinter, _p_wxPrinterTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxRadioBox, _p_wxRadioBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreeListColumnInfo, _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyControl, _p_wxPyControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelp, _p_wxContextHelpTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourData, _p_wxColourDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticText, _p_wxStaticTextTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCalculateLayoutEvent, _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListEvent, _p_wxListEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashSplitEvent, _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintout, _p_wxPyPrintoutTo_p_wxObject, 0, 0}, {&_swigt__p_wxGauge, _p_wxGaugeTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoice, _p_wxChoiceTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextHelpButton, _p_wxContextHelpButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmapButton, _p_wxBitmapButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxButton, _p_wxButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinButton, _p_wxSpinButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashEvent, _p_wxSashEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxListBox, _p_wxListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckListBox, _p_wxCheckListBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintData, _p_wxPrintDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontData, _p_wxFontDataTo_p_wxObject, 0, 0}, {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbook, _p_wxListbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxFrame, _p_wxFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBox, _p_wxStaticBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryLayoutInfoEvent, _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPrintPreview, _p_wxPyPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintPreview, _p_wxPrintPreviewTo_p_wxObject, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeListCtrl, _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyListCtrl, _p_wxPyListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirFilterListCtrl, _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxPickerBase, _p_wxPickerBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerEvent, _p_wxFontPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDirPickerEvent, _p_wxFileDirPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerEvent, _p_wxColourPickerEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextCtrl, _p_wxTextCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxRadioButton, _p_wxRadioButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxToggleButton, _p_wxToggleButtonTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashUnifyEvent, _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGenericDirCtrl, _p_wxGenericDirCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDialog, _p_wxDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourDialog, _p_wxColourDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirDialog, _p_wxDirDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontDialog, _p_wxFontDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPageSetupDialog, _p_wxPageSetupDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrintDialog, _p_wxPrintDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticPicture, _p_wxStaticPictureTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkCtrl, _p_wxHyperlinkCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxPopupWindow, _p_wxPopupWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashLayoutWindow, _p_wxSashLayoutWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSashWindow, _p_wxSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterWindow, _p_wxSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxThinSplitterWindow, _p_wxThinSplitterWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplashScreenWindow, _p_wxSplashScreenWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyPopupTransientWindow, _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxTopLevelWindow, _p_wxTopLevelWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIClientWindow, _p_wxMDIClientWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxDynamicSashWindow, _p_wxDynamicSashWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyTreeCompanionWindow, _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinCtrl, _p_wxSpinCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotebookEvent, _p_wxNotebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxListbookEvent, _p_wxListbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChoicebookEvent, _p_wxChoicebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTreebookEvent, _p_wxTreebookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbookEvent, _p_wxToolbookEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPasswordEntryDialog, _p_wxPasswordEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxTextEntryDialog, _p_wxTextEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxSingleChoiceDialog, _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMultiChoiceDialog, _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileDialog, _p_wxFileDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxNumberEntryDialog, _p_wxNumberEntryDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxMessageDialog, _p_wxMessageDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxFindReplaceDialog, _p_wxFindReplaceDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBarToolBase, _p_wxToolBarToolBaseTo_p_wxObject, 0, 0}, {&_swigt__p_wxFontPickerCtrl, _p_wxFontPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDirPickerCtrl, _p_wxDirPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxFilePickerCtrl, _p_wxFilePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxColourPickerCtrl, _p_wxColourPickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxDatePickerCtrl, _p_wxDatePickerCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxSlider, _p_wxSliderTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyWindow, _p_wxPyWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCheckBox, _p_wxCheckBoxTo_p_wxObject, 0, 0}, {&_swigt__p_wxHyperlinkEvent, _p_wxHyperlinkEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxHelpEvent, _p_wxHelpEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPanel, _p_wxPanelTo_p_wxObject, 0, 0}, {&_swigt__p_wxSpinEvent, _p_wxSpinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxTaskBarIconEvent, _p_wxTaskBarIconEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxLEDNumberCtrl, _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolBar, _p_wxToolBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxToolbook, _p_wxToolbookTo_p_wxObject, 0, 0}, {&_swigt__p_wxStatusBar, _p_wxStatusBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPanel[] = { {&_swigt__p_wxPanel, 0, 0, 0}, {&_swigt__p_wxScrolledWindow, _p_wxScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyScrolledWindow, _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxSplitterScrolledWindow, _p_wxSplitterScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVScrolledWindow, _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyVListBox, _p_wxPyVListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyHtmlListBox, _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPanel, _p_wxPyPanelTo_p_wxPanel, 0, 0}, {&_swigt__p_wxEditableListBox, _p_wxEditableListBoxTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewCanvas, _p_wxPreviewCanvasTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPreviewControlBar, _p_wxPreviewControlBarTo_p_wxPanel, 0, 0}, {&_swigt__p_wxPyPreviewControlBar, _p_wxPyPreviewControlBarTo_p_wxPanel, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaperSize[] = { {&_swigt__p_wxPaperSize, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxPyListCtrl[] = { {&_swigt__p_wxPyListCtrl, 0, 0, 0}, {&_swigt__p_wxListView, _p_wxListViewTo_p_wxPyListCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCompanionWindow[] = { {&_swigt__p_wxPyTreeCompanionWindow, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeCtrl[] = { {&_swigt__p_wxPyTreeCtrl, 0, 0, 0}, {&_swigt__p_wxRemotelyScrolledTreeCtrl, _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyTreeItemData[] = { {&_swigt__p_wxPyTreeItemData, 0, 0, 0},{0, 0, 0, 0}}; diff --git a/wxPython/distrib/all/do-build-windows b/wxPython/distrib/all/do-build-windows index 2f3d1ec105..050b6e3051 100755 --- a/wxPython/distrib/all/do-build-windows +++ b/wxPython/distrib/all/do-build-windows @@ -116,13 +116,14 @@ fi # $WXDIR/lib/vc_dll/tex2rtf.exe $DOCSRC $DOCDEST -twice -html -macros $DOCINI -echo "Extracting html docs..." -mkdir -p $WXDIR/docs/html/wx -cd $WXDIR/docs/html/wx -rm -rf * -tar xjf $DESTDIR/wxPython-docs-$VERSION.tar.bz2 -rm $DESTDIR/wxPython-docs-$VERSION.tar.bz2 -unzip wxPython-$VERSION/docs/wx.zip +# echo "Extracting html docs..." +# mkdir -p $WXDIR/docs/html/wx +# cd $WXDIR/docs/html/wx +# rm -rf * +# tar xjf $DESTDIR/wxPython-docs-$VERSION.tar.bz2 +# rm $DESTDIR/wxPython-docs-$VERSION.tar.bz2 +# unzip wxPython-$VERSION/docs/wx.zip + echo "Building the HTMLHelp file..." cd $WXDIR/docs/html/wx @@ -149,6 +150,7 @@ if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then b $PYVER r UNICODE=1 USE_SWIG=0 fi + echo "Building the developer package..." WXWIN=`cygpath -w $WXDIR` export WXWIN diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i index 62437e014b..0632593d0e 100644 --- a/wxPython/src/_event.i +++ b/wxPython/src/_event.i @@ -842,6 +842,9 @@ enum class wxMouseEvent : public wxEvent { public: + // turn off this typemap + %typemap(out) wxMouseEvent*; + DocCtorStr( wxMouseEvent(wxEventType mouseType = wxEVT_NULL), "Constructs a wx.MouseEvent. Valid event types are: @@ -860,6 +863,8 @@ public: * wxEVT_MOTION * wxEVT_MOUSEWHEEL ", ""); + // Turn it back on again + %typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, $owner); } DocDeclStr( bool , IsButton() const, diff --git a/wxPython/src/_filesys.i b/wxPython/src/_filesys.i index be1b01e81a..8975133d3d 100644 --- a/wxPython/src/_filesys.i +++ b/wxPython/src/_filesys.i @@ -144,9 +144,15 @@ public: class wxFileSystem : public wxObject { public: + // turn off this typemap + %typemap(out) wxFileSystem*; + wxFileSystem(); ~wxFileSystem(); + // Turn it back on again + %typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); } + void ChangePathTo(const wxString& location, bool is_dir = false); wxString GetPath(); diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i index 43bec0c1c2..cf0fff08d5 100644 --- a/wxPython/src/_image.i +++ b/wxPython/src/_image.i @@ -232,6 +232,7 @@ public: }; + class wxImage : public wxObject { public: %typemap(out) wxImage*; // turn off this typemap diff --git a/wxPython/src/_imaglist.i b/wxPython/src/_imaglist.i index d048849da2..9a63bb10b8 100644 --- a/wxPython/src/_imaglist.i +++ b/wxPython/src/_imaglist.i @@ -43,8 +43,14 @@ MustHaveApp(wxImageList); // two bitmaps, or an icon. class wxImageList : public wxObject { public: + // turn off this typemap + %typemap(out) wxImageList*; + wxImageList(int width, int height, int mask=true, int initialCount=1); ~wxImageList(); + + // Turn it back on again + %typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, $owner); } int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap); %Rename(AddWithColourMask,int, Add(const wxBitmap& bitmap, const wxColour& maskColour)); diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i index ce1701e47a..af9def88fa 100644 --- a/wxPython/src/_listctrl.i +++ b/wxPython/src/_listctrl.i @@ -192,9 +192,15 @@ public: // wxListItem: the item or column info, used to exchange data with wxListCtrl class wxListItem : public wxObject { public: + // turn off this typemap + %typemap(out) wxListItem*; + wxListItem(); ~wxListItem(); + // Turn it back on again + %typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, $owner); } + // resetting void Clear(); void ClearAttributes(); @@ -455,6 +461,8 @@ MustHaveApp(wxPyListCtrl); %rename(ListCtrl) wxPyListCtrl; class wxPyListCtrl : public wxControl { public: + // turn off this typemap + %typemap(out) wxPyListCtrl*; %pythonAppend wxPyListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)" %pythonAppend wxPyListCtrl() "" @@ -467,6 +475,9 @@ public: const wxString& name = wxPyListCtrlNameStr); %RenameCtor(PreListCtrl, wxPyListCtrl()); + // Turn it back on again + %typemap(out) wxPyListCtrl* { $result = wxPyMake_wxObject($1, $owner); } + bool Create(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i index 070d88a407..1bbb3a56e4 100644 --- a/wxPython/src/_menu.i +++ b/wxPython/src/_menu.i @@ -366,6 +366,9 @@ public: class wxMenuItem : public wxObject { public: + // turn off this typemap + %typemap(out) wxMenuItem*; + wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY, const wxString& text = wxPyEmptyString, const wxString& help = wxPyEmptyString, @@ -373,6 +376,10 @@ public: wxMenu* subMenu = NULL); ~wxMenuItem(); + // Turn it back on again + %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); } + + // the menu we're in wxMenu *GetMenu() const; void SetMenu(wxMenu* menu); diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i index c412e3026f..45ae59fd43 100644 --- a/wxPython/src/_misc.i +++ b/wxPython/src/_misc.i @@ -140,7 +140,8 @@ class wxStopWatch public: // ctor starts the stop watch wxStopWatch(); - + ~wxStopWatch(); + // start the stop watch at the moment t0 void Start(long t0 = 0); diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index eaaae7c563..10211935dc 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -19498,7 +19498,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -26516,9 +26518,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -28389,7 +28389,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< wxListEvent * >(argp1); result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29144,7 +29144,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29424,7 +29424,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -30498,7 +30498,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34282,7 +34284,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34310,7 +34314,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index b568cb0d1d..791e02fe3d 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -10866,9 +10866,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -20677,9 +20675,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -43590,9 +43586,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 ); { if (temp3) delete arg3; diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 91f5d9c4cb..a0c4f637e8 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -941,6 +941,8 @@ class StopWatch(object): def __init__(self, *args, **kwargs): """__init__(self) -> StopWatch""" _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs)) + __swig_destroy__ = _misc_.delete_StopWatch + __del__ = lambda self : None; def Start(*args, **kwargs): """Start(self, long t0=0)""" return _misc_.StopWatch_Start(*args, **kwargs) diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 2b0edad6aa..f8e050d97b 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -9281,6 +9281,34 @@ fail: } +SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStopWatch *arg1 = (wxStopWatch *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'"); + } + arg1 = reinterpret_cast< wxStopWatch * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStopWatch *arg1 = (wxStopWatch *) 0 ; @@ -39159,6 +39187,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL}, { (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL}, + { (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL}, { (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL}, { (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL}, diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp index d30f0a84d9..0cff49c9ac 100644 --- a/wxPython/src/gtk/html_wrap.cpp +++ b/wxPython/src/gtk/html_wrap.cpp @@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self), if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index c6ed014db9..8519e2f367 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -19423,7 +19423,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -26441,9 +26443,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -28314,7 +28314,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< wxListEvent * >(argp1); result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29069,7 +29069,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29349,7 +29349,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -30423,7 +30423,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34207,7 +34209,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34235,7 +34239,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 4df891d46b..5130610910 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -10865,9 +10865,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -20676,9 +20674,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -43589,9 +43585,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 ); { if (temp3) delete arg3; diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 4c29575658..ad5eaba23c 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -941,6 +941,8 @@ class StopWatch(object): def __init__(self, *args, **kwargs): """__init__(self) -> StopWatch""" _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs)) + __swig_destroy__ = _misc_.delete_StopWatch + __del__ = lambda self : None; def Start(*args, **kwargs): """Start(self, long t0=0)""" return _misc_.StopWatch_Start(*args, **kwargs) diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index 87d200eb20..f5d4dec462 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -9273,6 +9273,34 @@ fail: } +SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStopWatch *arg1 = (wxStopWatch *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'"); + } + arg1 = reinterpret_cast< wxStopWatch * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStopWatch *arg1 = (wxStopWatch *) 0 ; @@ -39220,6 +39248,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL}, { (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL}, + { (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL}, { (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL}, { (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL}, diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index 9872e6eb94..0980c54612 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self), if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 598e7bd977..89df018a69 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -19571,7 +19571,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -26589,9 +26591,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -28462,7 +28462,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self), arg1 = reinterpret_cast< wxListEvent * >(argp1); result = (wxListItem *)& ((arg1)->m_item); { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29217,7 +29217,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -29497,7 +29497,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -30522,7 +30522,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34350,7 +34352,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self), wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; @@ -34378,7 +34382,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 ); + { + resultobj = wxPyMake_wxObject(result, (bool)0); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 4926571a02..4cae7ef5cc 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -10850,9 +10850,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -20661,9 +20659,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 ); return resultobj; fail: return NULL; @@ -43615,9 +43611,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW); - } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 ); { if (temp3) delete arg3; diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index 4c29575658..ad5eaba23c 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -941,6 +941,8 @@ class StopWatch(object): def __init__(self, *args, **kwargs): """__init__(self) -> StopWatch""" _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs)) + __swig_destroy__ = _misc_.delete_StopWatch + __del__ = lambda self : None; def Start(*args, **kwargs): """Start(self, long t0=0)""" return _misc_.StopWatch_Start(*args, **kwargs) diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index 8a22911156..fe3f444b86 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -9273,6 +9273,34 @@ fail: } +SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxStopWatch *arg1 = (wxStopWatch *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'"); + } + arg1 = reinterpret_cast< wxStopWatch * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete arg1; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxStopWatch *arg1 = (wxStopWatch *) 0 ; @@ -39220,6 +39248,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL}, { (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL}, { (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL}, + { (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL}, { (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL}, { (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL}, diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index d30f0a84d9..0cff49c9ac 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self), if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxObject(result, (bool)0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i index a16dbff87f..22e6a019a7 100644 --- a/wxPython/src/my_typemaps.i +++ b/wxPython/src/my_typemaps.i @@ -370,7 +370,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %typemap(out) wxDC* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, (bool)$owner); } -//%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxImage* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, (bool)$owner); } @@ -386,7 +386,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %typemap(out) wxControl* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, (bool)$owner); } -//%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } +%typemap(out) wxPyListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, (bool)$owner); } @@ -396,7 +396,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field) %typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, (bool)$owner); } -//%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } %typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); } -- 2.45.2