From b0f7404b924646d088c8d7be13781176ea84bb68 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 17 Jul 2004 23:32:47 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp | 63 +++++++++--------- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 63 +++++++++--------- wxPython/contrib/gizmos/msw/gizmos_wrap.cpp | 63 +++++++++--------- wxPython/contrib/ogl/gtk/ogl_wrap.cpp | 16 ++--- wxPython/contrib/ogl/mac/ogl_wrap.cpp | 16 ++--- wxPython/contrib/ogl/msw/ogl_wrap.cpp | 16 ++--- wxPython/contrib/xrc/_xrc_rename.i | 1 + wxPython/contrib/xrc/gtk/xrc.py | 1 + wxPython/contrib/xrc/gtk/xrc_wrap.cpp | 1 + wxPython/contrib/xrc/mac/xrc.py | 1 + wxPython/contrib/xrc/mac/xrc_wrap.cpp | 1 + wxPython/contrib/xrc/msw/xrc.py | 1 + wxPython/contrib/xrc/msw/xrc_wrap.cpp | 1 + wxPython/src/gtk/_controls_wrap.cpp | 56 ++++------------ wxPython/src/gtk/_core.py | 1 + wxPython/src/gtk/_core_wrap.cpp | 40 ++++------- wxPython/src/gtk/_windows_wrap.cpp | 56 ++++------------ wxPython/src/gtk/grid_wrap.cpp | 58 ++++++++++------ wxPython/src/gtk/html.py | 8 +++ wxPython/src/gtk/html_wrap.cpp | 74 +++++++++++++++++++-- wxPython/src/mac/_controls_wrap.cpp | 56 ++++------------ wxPython/src/mac/_core_wrap.cpp | 39 +++-------- wxPython/src/mac/_windows_wrap.cpp | 56 ++++------------ wxPython/src/mac/grid_wrap.cpp | 58 ++++++++++------ wxPython/src/mac/html.py | 8 +++ wxPython/src/mac/html_wrap.cpp | 74 +++++++++++++++++++-- wxPython/src/msw/_controls_wrap.cpp | 56 ++++------------ wxPython/src/msw/_core.py | 1 + wxPython/src/msw/_core_wrap.cpp | 40 ++++------- wxPython/src/msw/_gdi_wrap.cpp | 12 +++- wxPython/src/msw/_windows_wrap.cpp | 56 ++++------------ wxPython/src/msw/grid_wrap.cpp | 58 ++++++++++------ wxPython/src/msw/html.py | 8 +++ wxPython/src/msw/html_wrap.cpp | 74 +++++++++++++++++++-- wxPython/wxPython/grid.py | 20 +++--- wxPython/wxPython/xrc.py | 1 + 36 files changed, 592 insertions(+), 562 deletions(-) diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp index 7de4025487..48233abbfc 100644 --- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp @@ -210,34 +210,35 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxObject swig_types[1] #define SWIGTYPE_p_wxColour swig_types[2] #define SWIGTYPE_p_wxPyTreeCtrl swig_types[3] -#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[4] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[5] -#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] -#define SWIGTYPE_p_wxImageList swig_types[7] -#define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[9] -#define SWIGTYPE_p_wxScrolledWindow swig_types[10] -#define SWIGTYPE_p_wxSplitterWindow swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] -#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[13] -#define SWIGTYPE_p_wxThinSplitterWindow swig_types[14] -#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[15] -#define SWIGTYPE_p_wxValidator swig_types[16] -#define SWIGTYPE_p_wxCommandEvent swig_types[17] -#define SWIGTYPE_p_wxArrayString swig_types[18] -#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[19] -#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] -#define SWIGTYPE_p_wxTreeItemId swig_types[21] -#define SWIGTYPE_p_char swig_types[22] -#define SWIGTYPE_p_wxEvtHandler swig_types[23] -#define SWIGTYPE_p_wxFont swig_types[24] -#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[25] -#define SWIGTYPE_p_wxControl swig_types[26] -#define SWIGTYPE_p_wxPanel swig_types[27] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[28] -#define SWIGTYPE_p_wxEvent swig_types[29] -#define SWIGTYPE_p_int swig_types[30] -static swig_type_info *swig_types[32]; +#define SWIGTYPE_p_wxListCtrl swig_types[4] +#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[5] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[6] +#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[7] +#define SWIGTYPE_p_wxImageList swig_types[8] +#define SWIGTYPE_p_wxScrollBar swig_types[9] +#define SWIGTYPE_p_wxDynamicSashWindow swig_types[10] +#define SWIGTYPE_p_wxScrolledWindow swig_types[11] +#define SWIGTYPE_p_wxSplitterWindow swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[14] +#define SWIGTYPE_p_wxThinSplitterWindow swig_types[15] +#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[16] +#define SWIGTYPE_p_wxValidator swig_types[17] +#define SWIGTYPE_p_wxCommandEvent swig_types[18] +#define SWIGTYPE_p_wxArrayString swig_types[19] +#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[20] +#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[21] +#define SWIGTYPE_p_wxTreeItemId swig_types[22] +#define SWIGTYPE_p_char swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxFont swig_types[25] +#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[26] +#define SWIGTYPE_p_wxControl swig_types[27] +#define SWIGTYPE_p_wxPanel swig_types[28] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[29] +#define SWIGTYPE_p_wxEvent swig_types[30] +#define SWIGTYPE_p_int swig_types[31] +static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ @@ -1272,9 +1273,7 @@ static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 0); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListCtrl, 0); return resultobj; fail: return NULL; @@ -8207,6 +8206,7 @@ static swig_type_info _swigt__p_wxEditableListBox[] = {{"_p_wxEditableListBox", static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0, 0, 0, 0},{"_p_wxListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRemotelyScrolledTreeCtrl[] = {{"_p_wxRemotelyScrolledTreeCtrl", 0, "wxRemotelyScrolledTreeCtrl *", 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnInfo", 0, "wxTreeListColumnInfo *", 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -8240,6 +8240,7 @@ _swigt__p_wxEditableListBox, _swigt__p_wxObject, _swigt__p_wxColour, _swigt__p_wxPyTreeCtrl, +_swigt__p_wxListCtrl, _swigt__p_wxRemotelyScrolledTreeCtrl, _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 71be1222e5..5bc8186d66 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -210,34 +210,35 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxObject swig_types[1] #define SWIGTYPE_p_wxColour swig_types[2] #define SWIGTYPE_p_wxPyTreeCtrl swig_types[3] -#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[4] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[5] -#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] -#define SWIGTYPE_p_wxImageList swig_types[7] -#define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[9] -#define SWIGTYPE_p_wxScrolledWindow swig_types[10] -#define SWIGTYPE_p_wxSplitterWindow swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] -#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[13] -#define SWIGTYPE_p_wxThinSplitterWindow swig_types[14] -#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[15] -#define SWIGTYPE_p_wxValidator swig_types[16] -#define SWIGTYPE_p_wxCommandEvent swig_types[17] -#define SWIGTYPE_p_wxArrayString swig_types[18] -#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[19] -#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] -#define SWIGTYPE_p_wxTreeItemId swig_types[21] -#define SWIGTYPE_p_char swig_types[22] -#define SWIGTYPE_p_wxEvtHandler swig_types[23] -#define SWIGTYPE_p_wxFont swig_types[24] -#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[25] -#define SWIGTYPE_p_wxControl swig_types[26] -#define SWIGTYPE_p_wxPanel swig_types[27] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[28] -#define SWIGTYPE_p_wxEvent swig_types[29] -#define SWIGTYPE_p_int swig_types[30] -static swig_type_info *swig_types[32]; +#define SWIGTYPE_p_wxListCtrl swig_types[4] +#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[5] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[6] +#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[7] +#define SWIGTYPE_p_wxImageList swig_types[8] +#define SWIGTYPE_p_wxScrollBar swig_types[9] +#define SWIGTYPE_p_wxDynamicSashWindow swig_types[10] +#define SWIGTYPE_p_wxScrolledWindow swig_types[11] +#define SWIGTYPE_p_wxSplitterWindow swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[14] +#define SWIGTYPE_p_wxThinSplitterWindow swig_types[15] +#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[16] +#define SWIGTYPE_p_wxValidator swig_types[17] +#define SWIGTYPE_p_wxCommandEvent swig_types[18] +#define SWIGTYPE_p_wxArrayString swig_types[19] +#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[20] +#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[21] +#define SWIGTYPE_p_wxTreeItemId swig_types[22] +#define SWIGTYPE_p_char swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxFont swig_types[25] +#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[26] +#define SWIGTYPE_p_wxControl swig_types[27] +#define SWIGTYPE_p_wxPanel swig_types[28] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[29] +#define SWIGTYPE_p_wxEvent swig_types[30] +#define SWIGTYPE_p_int swig_types[31] +static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ @@ -1272,9 +1273,7 @@ static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 0); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListCtrl, 0); return resultobj; fail: return NULL; @@ -8207,6 +8206,7 @@ static swig_type_info _swigt__p_wxEditableListBox[] = {{"_p_wxEditableListBox", static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0, 0, 0, 0},{"_p_wxListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRemotelyScrolledTreeCtrl[] = {{"_p_wxRemotelyScrolledTreeCtrl", 0, "wxRemotelyScrolledTreeCtrl *", 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnInfo", 0, "wxTreeListColumnInfo *", 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -8240,6 +8240,7 @@ _swigt__p_wxEditableListBox, _swigt__p_wxObject, _swigt__p_wxColour, _swigt__p_wxPyTreeCtrl, +_swigt__p_wxListCtrl, _swigt__p_wxRemotelyScrolledTreeCtrl, _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp index dc85f2b96b..26ef78560a 100644 --- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp @@ -210,34 +210,35 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxObject swig_types[1] #define SWIGTYPE_p_wxColour swig_types[2] #define SWIGTYPE_p_wxPyTreeCtrl swig_types[3] -#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[4] -#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[5] -#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] -#define SWIGTYPE_p_wxImageList swig_types[7] -#define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[9] -#define SWIGTYPE_p_wxScrolledWindow swig_types[10] -#define SWIGTYPE_p_wxSplitterWindow swig_types[11] -#define SWIGTYPE_p_wxWindow swig_types[12] -#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[13] -#define SWIGTYPE_p_wxThinSplitterWindow swig_types[14] -#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[15] -#define SWIGTYPE_p_wxValidator swig_types[16] -#define SWIGTYPE_p_wxCommandEvent swig_types[17] -#define SWIGTYPE_p_wxArrayString swig_types[18] -#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[19] -#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] -#define SWIGTYPE_p_wxTreeItemId swig_types[21] -#define SWIGTYPE_p_char swig_types[22] -#define SWIGTYPE_p_wxEvtHandler swig_types[23] -#define SWIGTYPE_p_wxFont swig_types[24] -#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[25] -#define SWIGTYPE_p_wxControl swig_types[26] -#define SWIGTYPE_p_wxPanel swig_types[27] -#define SWIGTYPE_p_wxPyTreeItemData swig_types[28] -#define SWIGTYPE_p_wxEvent swig_types[29] -#define SWIGTYPE_p_int swig_types[30] -static swig_type_info *swig_types[32]; +#define SWIGTYPE_p_wxListCtrl swig_types[4] +#define SWIGTYPE_p_wxRemotelyScrolledTreeCtrl swig_types[5] +#define SWIGTYPE_p_wxTreeListColumnInfo swig_types[6] +#define SWIGTYPE_p_wxPyTreeListCtrl swig_types[7] +#define SWIGTYPE_p_wxImageList swig_types[8] +#define SWIGTYPE_p_wxScrollBar swig_types[9] +#define SWIGTYPE_p_wxDynamicSashWindow swig_types[10] +#define SWIGTYPE_p_wxScrolledWindow swig_types[11] +#define SWIGTYPE_p_wxSplitterWindow swig_types[12] +#define SWIGTYPE_p_wxWindow swig_types[13] +#define SWIGTYPE_p_wxPyTreeCompanionWindow swig_types[14] +#define SWIGTYPE_p_wxThinSplitterWindow swig_types[15] +#define SWIGTYPE_p_wxSplitterScrolledWindow swig_types[16] +#define SWIGTYPE_p_wxValidator swig_types[17] +#define SWIGTYPE_p_wxCommandEvent swig_types[18] +#define SWIGTYPE_p_wxArrayString swig_types[19] +#define SWIGTYPE_p_wxLEDNumberCtrl swig_types[20] +#define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[21] +#define SWIGTYPE_p_wxTreeItemId swig_types[22] +#define SWIGTYPE_p_char swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxFont swig_types[25] +#define SWIGTYPE_p_wxDynamicSashUnifyEvent swig_types[26] +#define SWIGTYPE_p_wxControl swig_types[27] +#define SWIGTYPE_p_wxPanel swig_types[28] +#define SWIGTYPE_p_wxPyTreeItemData swig_types[29] +#define SWIGTYPE_p_wxEvent swig_types[30] +#define SWIGTYPE_p_int swig_types[31] +static swig_type_info *swig_types[33]; /* -------- TYPES TABLE (END) -------- */ @@ -1272,9 +1273,7 @@ static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 0); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxListCtrl, 0); return resultobj; fail: return NULL; @@ -8207,6 +8206,7 @@ static swig_type_info _swigt__p_wxEditableListBox[] = {{"_p_wxEditableListBox", static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0, 0, 0, 0},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvent", _p_wxEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImage", _p_wxImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListItem", _p_wxListItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxObject", 0, 0, 0, 0, 0, 0},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", _p_wxTreeListColumnInfoTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashSplitEvent", _p_wxDynamicSashSplitEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxButton", _p_wxButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbook", _p_wxListbookTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListView", _p_wxListViewTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizer", _p_wxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashUnifyEvent", _p_wxDynamicSashUnifyEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSlider", _p_wxSliderTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeCtrl", 0, 0, 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxPyTreeCtrl, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxListCtrl[] = {{"_p_wxListCtrl", 0, "wxListCtrl *", 0, 0, 0, 0},{"_p_wxListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxRemotelyScrolledTreeCtrl[] = {{"_p_wxRemotelyScrolledTreeCtrl", 0, "wxRemotelyScrolledTreeCtrl *", 0, 0, 0, 0},{"_p_wxRemotelyScrolledTreeCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnInfo", 0, "wxTreeListColumnInfo *", 0, 0, 0, 0},{"_p_wxTreeListColumnInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0, 0, 0, 0},{"_p_wxPyTreeListCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -8240,6 +8240,7 @@ _swigt__p_wxEditableListBox, _swigt__p_wxObject, _swigt__p_wxColour, _swigt__p_wxPyTreeCtrl, +_swigt__p_wxListCtrl, _swigt__p_wxRemotelyScrolledTreeCtrl, _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, diff --git a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp index 82dd952819..a14782d12c 100644 --- a/wxPython/contrib/ogl/gtk/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/gtk/ogl_wrap.cpp @@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1); return resultobj; fail: return NULL; @@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1); return resultobj; fail: return NULL; @@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1); return resultobj; fail: return NULL; @@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1); { if (temp6) delete arg6; diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp index 2ac85bec3c..c60c89728c 100644 --- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp @@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1); return resultobj; fail: return NULL; @@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1); return resultobj; fail: return NULL; @@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1); return resultobj; fail: return NULL; @@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1); { if (temp6) delete arg6; diff --git a/wxPython/contrib/ogl/msw/ogl_wrap.cpp b/wxPython/contrib/ogl/msw/ogl_wrap.cpp index 82dd952819..a14782d12c 100644 --- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/msw/ogl_wrap.cpp @@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1); return resultobj; fail: return NULL; @@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1); return resultobj; fail: return NULL; @@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxShapeEvtHandler(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1); return resultobj; fail: return NULL; @@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1); { if (temp6) delete arg6; diff --git a/wxPython/contrib/xrc/_xrc_rename.i b/wxPython/contrib/xrc/_xrc_rename.i index e8e01697ae..4d3a151792 100644 --- a/wxPython/contrib/xrc/_xrc_rename.i +++ b/wxPython/contrib/xrc/_xrc_rename.i @@ -5,6 +5,7 @@ %rename(XRC_USE_LOCALE) wxXRC_USE_LOCALE; %rename(XRC_NO_SUBCLASSING) wxXRC_NO_SUBCLASSING; +%rename(XRC_NO_RELOADING) wxXRC_NO_RELOADING; %rename(XmlResource) wxXmlResource; %rename(XML_ELEMENT_NODE) wxXML_ELEMENT_NODE; %rename(XML_ATTRIBUTE_NODE) wxXML_ATTRIBUTE_NODE; diff --git a/wxPython/contrib/xrc/gtk/xrc.py b/wxPython/contrib/xrc/gtk/xrc.py index 4dedbfea2d..e5bdb94fb8 100644 --- a/wxPython/contrib/xrc/gtk/xrc.py +++ b/wxPython/contrib/xrc/gtk/xrc.py @@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING +XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING class XmlResource(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/contrib/xrc/gtk/xrc_wrap.cpp b/wxPython/contrib/xrc/gtk/xrc_wrap.cpp index cf0f207cbf..afb0621e3a 100644 --- a/wxPython/contrib/xrc/gtk/xrc_wrap.cpp +++ b/wxPython/contrib/xrc/gtk/xrc_wrap.cpp @@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION)); PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE)); PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING)); + PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING)); PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE)); PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE)); PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE)); diff --git a/wxPython/contrib/xrc/mac/xrc.py b/wxPython/contrib/xrc/mac/xrc.py index 4dedbfea2d..e5bdb94fb8 100644 --- a/wxPython/contrib/xrc/mac/xrc.py +++ b/wxPython/contrib/xrc/mac/xrc.py @@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING +XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING class XmlResource(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/contrib/xrc/mac/xrc_wrap.cpp b/wxPython/contrib/xrc/mac/xrc_wrap.cpp index cf0f207cbf..afb0621e3a 100644 --- a/wxPython/contrib/xrc/mac/xrc_wrap.cpp +++ b/wxPython/contrib/xrc/mac/xrc_wrap.cpp @@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION)); PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE)); PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING)); + PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING)); PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE)); PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE)); PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE)); diff --git a/wxPython/contrib/xrc/msw/xrc.py b/wxPython/contrib/xrc/msw/xrc.py index 4dedbfea2d..e5bdb94fb8 100644 --- a/wxPython/contrib/xrc/msw/xrc.py +++ b/wxPython/contrib/xrc/msw/xrc.py @@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING +XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING class XmlResource(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/contrib/xrc/msw/xrc_wrap.cpp b/wxPython/contrib/xrc/msw/xrc_wrap.cpp index cf0f207cbf..afb0621e3a 100644 --- a/wxPython/contrib/xrc/msw/xrc_wrap.cpp +++ b/wxPython/contrib/xrc/msw/xrc_wrap.cpp @@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION)); PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE)); PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING)); + PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING)); PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE)); PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE)); PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE)); diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 4f2655eb85..f0b833d1b2 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -1126,9 +1126,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); { if (temp3) delete arg3; @@ -1167,9 +1165,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); return resultobj; fail: return NULL; @@ -1468,9 +1464,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); { if (temp8) delete arg8; @@ -1501,9 +1495,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); return resultobj; fail: return NULL; @@ -4469,9 +4461,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); { if (temp3) delete arg3; @@ -4510,9 +4500,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); return resultobj; fail: return NULL; @@ -8052,9 +8040,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); { if (temp3) delete arg3; @@ -8093,9 +8079,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); return resultobj; fail: return NULL; @@ -15024,9 +15008,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); { if (temp6) delete arg6; @@ -15057,9 +15039,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); return resultobj; fail: return NULL; @@ -18439,9 +18419,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); { if (temp6) delete arg6; @@ -18472,9 +18450,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); return resultobj; fail: return NULL; @@ -25007,9 +24983,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); { if (temp7) delete arg7; @@ -25040,9 +25014,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 9cfcd0b3f1..1008ccf9eb 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -4323,6 +4323,7 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsBackward = _core_.NavigationKeyEvent_IsBackward IsForward = _core_.NavigationKeyEvent_IsForward WinChange = _core_.NavigationKeyEvent_WinChange diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index a21764239c..e57f83b554 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -1605,7 +1605,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, } void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ @@ -11783,9 +11784,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1); return resultobj; fail: return NULL; @@ -19492,9 +19491,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1); return resultobj; fail: return NULL; @@ -21520,9 +21517,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); { if (temp6) delete arg6; @@ -21553,9 +21548,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); return resultobj; fail: return NULL; @@ -28499,9 +28492,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1); return resultobj; fail: return NULL; @@ -28852,9 +28843,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1); { if (temp1) delete arg1; @@ -31039,9 +31028,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1); return resultobj; fail: return NULL; @@ -33016,9 +33003,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); { if (temp7) delete arg7; @@ -33049,9 +33034,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); return resultobj; fail: return NULL; @@ -42820,6 +42803,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward)); PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index cc49318263..609b9f2838 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -1399,9 +1399,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); { if (temp6) delete arg6; @@ -1432,9 +1430,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); return resultobj; fail: return NULL; @@ -1652,9 +1648,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); { if (temp6) delete arg6; @@ -1685,9 +1679,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); return resultobj; fail: return NULL; @@ -3164,9 +3156,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); { if (temp3) delete arg3; @@ -3205,9 +3195,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); return resultobj; fail: return NULL; @@ -4107,9 +4095,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); { if (temp3) delete arg3; @@ -4148,9 +4134,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); return resultobj; fail: return NULL; @@ -5085,9 +5069,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); { if (temp4) delete arg4; @@ -5118,9 +5100,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); return resultobj; fail: return NULL; @@ -15088,9 +15068,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); { if (temp3) delete arg3; @@ -15129,9 +15107,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); return resultobj; fail: return NULL; @@ -15352,9 +15328,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; @@ -15377,9 +15351,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index abeadb6256..8b1ba120bb 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \ wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ if (data) { \ target = data->m_obj; \ - Py_INCREF(target); \ + if (target) \ + Py_INCREF(target); \ } \ /* Otherwise make a new wrapper for it the old fashioned way and \ give it the OOR treatment */ \ @@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr) } } + +#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS +#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS +#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT +#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH +#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT +#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH +#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE +#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT +#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH +#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH + void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } #include @@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters) void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } class wxPyGridCellEditor : public wxGridCellEditor @@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue) void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(unsigned long) @@ -1172,7 +1189,8 @@ public: }; void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(int) @@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); { if (temp6) delete arg6; @@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); return resultobj; fail: return NULL; @@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime")); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS)); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH)); - PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE)); - PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH)); + PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE)); + PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH)); PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any)); PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default)); PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell)); diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py index c6ae9a3a18..75d51cc526 100644 --- a/wxPython/src/gtk/html.py +++ b/wxPython/src/gtk/html.py @@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow): """SelectAll(self)""" return _html.HtmlWindow_SelectAll(*args, **kwargs) + def SelectionToText(*args, **kwargs): + """SelectionToText(self) -> String""" + return _html.HtmlWindow_SelectionToText(*args, **kwargs) + + def ToText(*args, **kwargs): + """ToText(self) -> String""" + return _html.HtmlWindow_ToText(*args, **kwargs) + def base_OnLinkClicked(*args, **kwargs): """base_OnLinkClicked(self, HtmlLinkInfo link)""" return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs) diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp index 277164030c..6b07e8b780 100644 --- a/wxPython/src/gtk/html_wrap.cpp +++ b/wxPython/src/gtk/html_wrap.cpp @@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); { if (temp6) delete arg6; @@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); return resultobj; fail: return NULL; @@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->SelectionToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->ToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; @@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp index 8c74044022..cbc3a99369 100644 --- a/wxPython/src/mac/_controls_wrap.cpp +++ b/wxPython/src/mac/_controls_wrap.cpp @@ -1123,9 +1123,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); { if (temp3) delete arg3; @@ -1164,9 +1162,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); return resultobj; fail: return NULL; @@ -1465,9 +1461,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); { if (temp8) delete arg8; @@ -1498,9 +1492,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); return resultobj; fail: return NULL; @@ -4466,9 +4458,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); { if (temp3) delete arg3; @@ -4507,9 +4497,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); return resultobj; fail: return NULL; @@ -8023,9 +8011,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); { if (temp3) delete arg3; @@ -8064,9 +8050,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); return resultobj; fail: return NULL; @@ -14995,9 +14979,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); { if (temp6) delete arg6; @@ -15028,9 +15010,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); return resultobj; fail: return NULL; @@ -18410,9 +18390,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); { if (temp6) delete arg6; @@ -18443,9 +18421,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); return resultobj; fail: return NULL; @@ -24978,9 +24954,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); { if (temp7) delete arg7; @@ -25011,9 +24985,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 0a6e61ef64..e57f83b554 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -1605,7 +1605,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, } void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ @@ -11783,9 +11784,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1); return resultobj; fail: return NULL; @@ -19492,9 +19491,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1); return resultobj; fail: return NULL; @@ -21520,9 +21517,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); { if (temp6) delete arg6; @@ -21553,9 +21548,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); return resultobj; fail: return NULL; @@ -28499,9 +28492,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1); return resultobj; fail: return NULL; @@ -28852,9 +28843,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1); { if (temp1) delete arg1; @@ -31039,9 +31028,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1); return resultobj; fail: return NULL; @@ -33016,9 +33003,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); { if (temp7) delete arg7; @@ -33049,9 +33034,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp index 6c20dbed2a..81ca25e539 100644 --- a/wxPython/src/mac/_windows_wrap.cpp +++ b/wxPython/src/mac/_windows_wrap.cpp @@ -1394,9 +1394,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); { if (temp6) delete arg6; @@ -1427,9 +1425,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); return resultobj; fail: return NULL; @@ -1647,9 +1643,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); { if (temp6) delete arg6; @@ -1680,9 +1674,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); return resultobj; fail: return NULL; @@ -3278,9 +3270,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); { if (temp3) delete arg3; @@ -3319,9 +3309,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); return resultobj; fail: return NULL; @@ -4221,9 +4209,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); { if (temp3) delete arg3; @@ -4262,9 +4248,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); return resultobj; fail: return NULL; @@ -5199,9 +5183,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); { if (temp4) delete arg4; @@ -5232,9 +5214,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); return resultobj; fail: return NULL; @@ -14862,9 +14842,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); { if (temp3) delete arg3; @@ -14903,9 +14881,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); return resultobj; fail: return NULL; @@ -15126,9 +15102,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; @@ -15151,9 +15125,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 984761715f..ef2bf40b90 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \ wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ if (data) { \ target = data->m_obj; \ - Py_INCREF(target); \ + if (target) \ + Py_INCREF(target); \ } \ /* Otherwise make a new wrapper for it the old fashioned way and \ give it the OOR treatment */ \ @@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr) } } + +#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS +#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS +#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT +#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH +#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT +#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH +#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE +#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT +#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH +#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH + void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } #include @@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters) void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } class wxPyGridCellEditor : public wxGridCellEditor @@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue) void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(unsigned long) @@ -1172,7 +1189,8 @@ public: }; void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(int) @@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); { if (temp6) delete arg6; @@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); return resultobj; fail: return NULL; @@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime")); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS)); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH)); - PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE)); - PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH)); + PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE)); + PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH)); PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any)); PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default)); PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell)); diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py index c6ae9a3a18..75d51cc526 100644 --- a/wxPython/src/mac/html.py +++ b/wxPython/src/mac/html.py @@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow): """SelectAll(self)""" return _html.HtmlWindow_SelectAll(*args, **kwargs) + def SelectionToText(*args, **kwargs): + """SelectionToText(self) -> String""" + return _html.HtmlWindow_SelectionToText(*args, **kwargs) + + def ToText(*args, **kwargs): + """ToText(self) -> String""" + return _html.HtmlWindow_ToText(*args, **kwargs) + def base_OnLinkClicked(*args, **kwargs): """base_OnLinkClicked(self, HtmlLinkInfo link)""" return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs) diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index 2893d2be5d..8c416fc1b9 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); { if (temp6) delete arg6; @@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); return resultobj; fail: return NULL; @@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->SelectionToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->ToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; @@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp index 8058d6f6fd..e7d08d7df5 100644 --- a/wxPython/src/msw/_controls_wrap.cpp +++ b/wxPython/src/msw/_controls_wrap.cpp @@ -1123,9 +1123,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); { if (temp3) delete arg3; @@ -1164,9 +1162,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1); return resultobj; fail: return NULL; @@ -1465,9 +1461,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); { if (temp8) delete arg8; @@ -1498,9 +1492,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1); return resultobj; fail: return NULL; @@ -4466,9 +4458,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); { if (temp3) delete arg3; @@ -4507,9 +4497,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1); return resultobj; fail: return NULL; @@ -8049,9 +8037,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); { if (temp3) delete arg3; @@ -8090,9 +8076,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1); return resultobj; fail: return NULL; @@ -15083,9 +15067,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); { if (temp6) delete arg6; @@ -15116,9 +15098,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1); return resultobj; fail: return NULL; @@ -18534,9 +18514,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); { if (temp6) delete arg6; @@ -18567,9 +18545,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1); return resultobj; fail: return NULL; @@ -25130,9 +25106,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); { if (temp7) delete arg7; @@ -25163,9 +25137,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index ff910a841f..4f431e5b0c 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -4323,6 +4323,7 @@ class NavigationKeyEvent(Event): """SetCurrentFocus(self, Window win)""" return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs) + IsBackward = _core_.NavigationKeyEvent_IsBackward IsForward = _core_.NavigationKeyEvent_IsForward WinChange = _core_.NavigationKeyEvent_WinChange diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 0ec3f4c038..6913d1cc36 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -1603,7 +1603,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize, } void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){ @@ -11781,9 +11782,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1); return resultobj; fail: return NULL; @@ -19490,9 +19489,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1); return resultobj; fail: return NULL; @@ -21518,9 +21515,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); { if (temp6) delete arg6; @@ -21551,9 +21546,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1); return resultobj; fail: return NULL; @@ -28560,9 +28553,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1); return resultobj; fail: return NULL; @@ -28913,9 +28904,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1); { if (temp1) delete arg1; @@ -31100,9 +31089,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1); return resultobj; fail: return NULL; @@ -33516,9 +33503,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); { if (temp7) delete arg7; @@ -33549,9 +33534,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1); return resultobj; fail: return NULL; @@ -43336,6 +43319,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL)); PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED)); + PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward)); PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward)); PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange)); PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL)); diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 0b081b5b2c..1de2969e7f 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -747,11 +747,17 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){ wxArrayString* arr = self->GetEncodings(); - return wxArrayString2PyList_helper(*arr); + if (arr) + return wxArrayString2PyList_helper(*arr); + else + return PyList_New(0); } PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){ wxArrayString* arr = self->GetFacenames(); - return wxArrayString2PyList_helper(*arr); + if (arr) + return wxArrayString2PyList_helper(*arr); + else + return PyList_New(0); } @@ -9226,7 +9232,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->GetNoAntiAliasing(); + result = (bool)((wxFont const *)arg1)->GetNoAntiAliasing(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp index 897fa27ea0..2651fb3b46 100644 --- a/wxPython/src/msw/_windows_wrap.cpp +++ b/wxPython/src/msw/_windows_wrap.cpp @@ -1399,9 +1399,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); { if (temp6) delete arg6; @@ -1432,9 +1430,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1); return resultobj; fail: return NULL; @@ -1652,9 +1648,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); { if (temp6) delete arg6; @@ -1685,9 +1679,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1); return resultobj; fail: return NULL; @@ -3226,9 +3218,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); { if (temp3) delete arg3; @@ -3267,9 +3257,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1); return resultobj; fail: return NULL; @@ -4169,9 +4157,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); { if (temp3) delete arg3; @@ -4210,9 +4196,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1); return resultobj; fail: return NULL; @@ -5147,9 +5131,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); { if (temp4) delete arg4; @@ -5180,9 +5162,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1); return resultobj; fail: return NULL; @@ -15236,9 +15216,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); { if (temp3) delete arg3; @@ -15277,9 +15255,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1); return resultobj; fail: return NULL; @@ -15500,9 +15476,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; @@ -15525,9 +15499,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1); return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index abeadb6256..8b1ba120bb 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \ wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \ if (data) { \ target = data->m_obj; \ - Py_INCREF(target); \ + if (target) \ + Py_INCREF(target); \ } \ /* Otherwise make a new wrapper for it the old fashioned way and \ give it the OOR treatment */ \ @@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr) } } + +#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS +#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS +#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT +#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH +#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT +#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH +#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE +#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT +#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH +#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH + void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } #include @@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters) void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } class wxPyGridCellEditor : public wxGridCellEditor @@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue) void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(unsigned long) @@ -1172,7 +1189,8 @@ public: }; void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){ - self->SetClientObject(new wxPyOORClientData(_self)); + if (!self->GetClientObject()) + self->SetClientObject(new wxPyOORClientData(_self)); } SWIGSTATICINLINE(int) @@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); { if (temp6) delete arg6; @@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1); return resultobj; fail: return NULL; @@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime")); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS)); - PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT)); - PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH)); - PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE)); - PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT)); - PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH)); - PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS)); + PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT)); + PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH)); + PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE)); + PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT)); + PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH)); + PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH)); PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any)); PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default)); PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell)); diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py index c6ae9a3a18..75d51cc526 100644 --- a/wxPython/src/msw/html.py +++ b/wxPython/src/msw/html.py @@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow): """SelectAll(self)""" return _html.HtmlWindow_SelectAll(*args, **kwargs) + def SelectionToText(*args, **kwargs): + """SelectionToText(self) -> String""" + return _html.HtmlWindow_SelectionToText(*args, **kwargs) + + def ToText(*args, **kwargs): + """ToText(self) -> String""" + return _html.HtmlWindow_ToText(*args, **kwargs) + def base_OnLinkClicked(*args, **kwargs): """base_OnLinkClicked(self, HtmlLinkInfo link)""" return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs) diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp index 277164030c..6b07e8b780 100644 --- a/wxPython/src/msw/html_wrap.cpp +++ b/wxPython/src/msw/html_wrap.cpp @@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); { if (temp6) delete arg6; @@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = wxPyMake_wxObject(result, 1); - } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1); return resultobj; fail: return NULL; @@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->SelectionToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->ToText(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ; @@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS }, + { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS }, { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/wxPython/grid.py b/wxPython/wxPython/grid.py index 78d0f988d7..32d4b0ab5b 100644 --- a/wxPython/wxPython/grid.py +++ b/wxPython/wxPython/grid.py @@ -31,16 +31,16 @@ wxGRID_VALUE_CHOICEINT = wx.grid.GRID_VALUE_CHOICEINT wxGRID_VALUE_DATETIME = wx.grid.GRID_VALUE_DATETIME wxGridNoCellCoords = wx.grid.GridNoCellCoords wxGridNoCellRect = wx.grid.GridNoCellRect -WXGRID_DEFAULT_NUMBER_ROWS = wx.grid.WXGRID_DEFAULT_NUMBER_ROWS -WXGRID_DEFAULT_NUMBER_COLS = wx.grid.WXGRID_DEFAULT_NUMBER_COLS -WXGRID_DEFAULT_ROW_HEIGHT = wx.grid.WXGRID_DEFAULT_ROW_HEIGHT -WXGRID_DEFAULT_COL_WIDTH = wx.grid.WXGRID_DEFAULT_COL_WIDTH -WXGRID_DEFAULT_COL_LABEL_HEIGHT = wx.grid.WXGRID_DEFAULT_COL_LABEL_HEIGHT -WXGRID_DEFAULT_ROW_LABEL_WIDTH = wx.grid.WXGRID_DEFAULT_ROW_LABEL_WIDTH -WXGRID_LABEL_EDGE_ZONE = wx.grid.WXGRID_LABEL_EDGE_ZONE -WXGRID_MIN_ROW_HEIGHT = wx.grid.WXGRID_MIN_ROW_HEIGHT -WXGRID_MIN_COL_WIDTH = wx.grid.WXGRID_MIN_COL_WIDTH -WXGRID_DEFAULT_SCROLLBAR_WIDTH = wx.grid.WXGRID_DEFAULT_SCROLLBAR_WIDTH +wxGRID_DEFAULT_NUMBER_ROWS = wx.grid.GRID_DEFAULT_NUMBER_ROWS +wxGRID_DEFAULT_NUMBER_COLS = wx.grid.GRID_DEFAULT_NUMBER_COLS +wxGRID_DEFAULT_ROW_HEIGHT = wx.grid.GRID_DEFAULT_ROW_HEIGHT +wxGRID_DEFAULT_COL_WIDTH = wx.grid.GRID_DEFAULT_COL_WIDTH +wxGRID_DEFAULT_COL_LABEL_HEIGHT = wx.grid.GRID_DEFAULT_COL_LABEL_HEIGHT +wxGRID_DEFAULT_ROW_LABEL_WIDTH = wx.grid.GRID_DEFAULT_ROW_LABEL_WIDTH +wxGRID_LABEL_EDGE_ZONE = wx.grid.GRID_LABEL_EDGE_ZONE +wxGRID_MIN_ROW_HEIGHT = wx.grid.GRID_MIN_ROW_HEIGHT +wxGRID_MIN_COL_WIDTH = wx.grid.GRID_MIN_COL_WIDTH +wxGRID_DEFAULT_SCROLLBAR_WIDTH = wx.grid.GRID_DEFAULT_SCROLLBAR_WIDTH wxGridCellRenderer = wx.grid.GridCellRenderer wxGridCellRendererPtr = wx.grid.GridCellRendererPtr wxPyGridCellRenderer = wx.grid.PyGridCellRenderer diff --git a/wxPython/wxPython/xrc.py b/wxPython/wxPython/xrc.py index c2b012a731..f7b250b9eb 100644 --- a/wxPython/wxPython/xrc.py +++ b/wxPython/wxPython/xrc.py @@ -32,6 +32,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = wx.xrc.WX_XMLRES_CURRENT_VERSION_RELEASE WX_XMLRES_CURRENT_VERSION_REVISION = wx.xrc.WX_XMLRES_CURRENT_VERSION_REVISION wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING +wxXRC_NO_RELOADING = wx.xrc.XRC_NO_RELOADING wxXmlResource = wx.xrc.XmlResource wxXmlResourcePtr = wx.xrc.XmlResourcePtr wxEmptyXmlResource = wx.xrc.EmptyXmlResource -- 2.47.2