From 02a34c4c56065ff2802c1deef9dd02919c565fda Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 5 Feb 2004 01:12:26 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/mac/gizmos_wrap.cpp | 62 +- .../contrib/glcanvas/mac/glcanvas_wrap.cpp | 9 +- wxPython/contrib/ogl/mac/ogl_wrap.cpp | 170 ++-- wxPython/src/mac/calendar_wrap.cpp | 50 +- wxPython/src/mac/controls.py | 39 +- wxPython/src/mac/controls_wrap.cpp | 888 +++++++++++------- wxPython/src/mac/core_wrap.cpp | 522 +++++----- wxPython/src/mac/gdi_wrap.cpp | 173 ++-- wxPython/src/mac/grid_wrap.cpp | 177 ++-- wxPython/src/mac/html_wrap.cpp | 59 +- wxPython/src/mac/misc.py | 62 +- wxPython/src/mac/misc_wrap.cpp | 816 ++++++++++------ wxPython/src/mac/windows.py | 4 +- wxPython/src/mac/windows_wrap.cpp | 249 +++-- wxPython/src/mac/wizard_wrap.cpp | 39 +- 15 files changed, 1855 insertions(+), 1464 deletions(-) diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp index 5a07e2790f..45a23166b9 100644 --- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp +++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp @@ -239,10 +239,10 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxPyTreeListCtrl swig_types[6] #define SWIGTYPE_p_wxImageList swig_types[7] #define SWIGTYPE_p_wxScrollBar swig_types[8] -#define SWIGTYPE_p_wxScrolledWindow swig_types[9] -#define SWIGTYPE_p_wxSplitterWindow swig_types[10] -#define SWIGTYPE_p_wxWindow swig_types[11] -#define SWIGTYPE_p_wxDynamicSashWindow swig_types[12] +#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] @@ -253,16 +253,15 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxDynamicSashSplitEvent swig_types[20] #define SWIGTYPE_p_wxTreeItemId swig_types[21] #define SWIGTYPE_p_char swig_types[22] -#define SWIGTYPE_p_wxString 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]; +#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]; /* -------- TYPES TABLE (END) -------- */ @@ -347,15 +346,6 @@ SWIG_PyObj_AsLong(PyObject * obj) return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - PyObject *wxEditableListBox_GetStrings(wxEditableListBox *self){ wxArrayString strings; self->GetStrings(strings); @@ -870,7 +860,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -1942,7 +1932,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1992,7 +1982,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2715,7 +2705,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -4345,7 +4335,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4481,7 +4471,7 @@ static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4512,7 +4502,7 @@ static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4543,7 +4533,7 @@ static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4574,7 +4564,7 @@ static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4605,7 +4595,7 @@ static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7763,10 +7753,10 @@ static swig_type_info _swigt__p_wxTreeListColumnInfo[] = {{"_p_wxTreeListColumnI static swig_type_info _swigt__p_wxPyTreeListCtrl[] = {{"_p_wxPyTreeListCtrl", 0, "wxPyTreeListCtrl *", 0},{"_p_wxPyTreeListCtrl"},{0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; static swig_type_info _swigt__p_wxScrollBar[] = {{"_p_wxScrollBar", 0, "wxScrollBar *", 0},{"_p_wxScrollBar"},{0}}; +static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxScrolledWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxSplitterWindow[] = {{"_p_wxSplitterWindow", 0, "wxSplitterWindow *", 0},{"_p_wxSplitterWindow"},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxSplitterWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxWindow},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxWindow},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxWindow},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxWindow},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxWindow},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxWindow},{"_p_wxPyControl", _p_wxPyControlTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxGauge", _p_wxGaugeTo_p_wxWindow},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxWindow},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxWindow},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxWindow},{"_p_wxChoice", _p_wxChoiceTo_p_wxWindow},{"_p_wxListView", _p_wxListViewTo_p_wxWindow},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxWindow},{"_p_wxNotebook", _p_wxNotebookTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxListbook", _p_wxListbookTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxWindow},{"_p_wxSlider", _p_wxSliderTo_p_wxWindow},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxWindow},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxWindow},{"_p_wxListBox", _p_wxListBoxTo_p_wxWindow},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxWindow},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxWindow},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxWindow},{"_p_wxButton", _p_wxButtonTo_p_wxWindow},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxWindow},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxWindow},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxWindow},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxWindow},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxWindow},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxWindow},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxWindow},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxToolBar", _p_wxToolBarTo_p_wxWindow},{0}}; -static swig_type_info _swigt__p_wxDynamicSashWindow[] = {{"_p_wxDynamicSashWindow", 0, "wxDynamicSashWindow *", 0},{"_p_wxDynamicSashWindow"},{0}}; static swig_type_info _swigt__p_wxPyTreeCompanionWindow[] = {{"_p_wxPyTreeCompanionWindow", 0, "wxPyTreeCompanionWindow *", 0},{"_p_wxPyTreeCompanionWindow"},{0}}; static swig_type_info _swigt__p_wxThinSplitterWindow[] = {{"_p_wxThinSplitterWindow", 0, "wxThinSplitterWindow *", 0},{"_p_wxThinSplitterWindow"},{0}}; static swig_type_info _swigt__p_wxSplitterScrolledWindow[] = {{"_p_wxSplitterScrolledWindow", 0, "wxSplitterScrolledWindow *", 0},{"_p_wxSplitterScrolledWindow"},{0}}; @@ -7777,7 +7767,6 @@ static swig_type_info _swigt__p_wxLEDNumberCtrl[] = {{"_p_wxLEDNumberCtrl", 0, " static swig_type_info _swigt__p_wxDynamicSashSplitEvent[] = {{"_p_wxDynamicSashSplitEvent", 0, "wxDynamicSashSplitEvent *", 0},{"_p_wxDynamicSashSplitEvent"},{0}}; static swig_type_info _swigt__p_wxTreeItemId[] = {{"_p_wxTreeItemId", 0, "wxTreeItemId *", 0},{"_p_wxTreeItemId"},{0}}; static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxEvtHandler},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxEvtHandler},{"_p_wxRemotelyScrolledTreeCtrl", _p_wxRemotelyScrolledTreeCtrlTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxEvtHandler},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxEvtHandler},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxEvtHandler},{"_p_wxPyTreeListCtrl", _p_wxPyTreeListCtrlTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxPyControl", _p_wxPyControlTo_p_wxEvtHandler},{"_p_wxGauge", _p_wxGaugeTo_p_wxEvtHandler},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxEvtHandler},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxEvtHandler},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxEvtHandler},{"_p_wxChoice", _p_wxChoiceTo_p_wxEvtHandler},{"_p_wxListView", _p_wxListViewTo_p_wxEvtHandler},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxEvtHandler},{"_p_wxNotebook", _p_wxNotebookTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxListbook", _p_wxListbookTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxEvtHandler},{"_p_wxSlider", _p_wxSliderTo_p_wxEvtHandler},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxEditableListBox", _p_wxEditableListBoxTo_p_wxEvtHandler},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxEvtHandler},{"_p_wxListBox", _p_wxListBoxTo_p_wxEvtHandler},{"_p_wxLEDNumberCtrl", _p_wxLEDNumberCtrlTo_p_wxEvtHandler},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxEvtHandler},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxEvtHandler},{"_p_wxButton", _p_wxButtonTo_p_wxEvtHandler},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxEvtHandler},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxEvtHandler},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxEvtHandler},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxEvtHandler},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{"_p_wxSplitterScrolledWindow", _p_wxSplitterScrolledWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxDynamicSashWindow", _p_wxDynamicSashWindowTo_p_wxEvtHandler},{"_p_wxPyTreeCompanionWindow", _p_wxPyTreeCompanionWindowTo_p_wxEvtHandler},{"_p_wxThinSplitterWindow", _p_wxThinSplitterWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxToolBar", _p_wxToolBarTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; static swig_type_info _swigt__p_wxDynamicSashUnifyEvent[] = {{"_p_wxDynamicSashUnifyEvent", 0, "wxDynamicSashUnifyEvent *", 0},{"_p_wxDynamicSashUnifyEvent"},{0}}; @@ -7797,10 +7786,10 @@ _swigt__p_wxTreeListColumnInfo, _swigt__p_wxPyTreeListCtrl, _swigt__p_wxImageList, _swigt__p_wxScrollBar, +_swigt__p_wxDynamicSashWindow, _swigt__p_wxScrolledWindow, _swigt__p_wxSplitterWindow, _swigt__p_wxWindow, -_swigt__p_wxDynamicSashWindow, _swigt__p_wxPyTreeCompanionWindow, _swigt__p_wxThinSplitterWindow, _swigt__p_wxSplitterScrolledWindow, @@ -7811,7 +7800,6 @@ _swigt__p_wxLEDNumberCtrl, _swigt__p_wxDynamicSashSplitEvent, _swigt__p_wxTreeItemId, _swigt__p_char, -_swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, _swigt__p_wxDynamicSashUnifyEvent, diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp index c2326871a7..6d8e496823 100644 --- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp +++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp @@ -236,10 +236,9 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_char swig_types[3] #define SWIGTYPE_p_wxPalette swig_types[4] #define SWIGTYPE_p_wxGLCanvas swig_types[5] -#define SWIGTYPE_p_wxString swig_types[6] -#define SWIGTYPE_p_wxGLContext swig_types[7] -#define SWIGTYPE_p_int swig_types[8] -static swig_type_info *swig_types[10]; +#define SWIGTYPE_p_wxGLContext swig_types[6] +#define SWIGTYPE_p_int swig_types[7] +static swig_type_info *swig_types[9]; /* -------- TYPES TABLE (END) -------- */ @@ -1177,7 +1176,6 @@ static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtH static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; static swig_type_info _swigt__p_wxPalette[] = {{"_p_wxPalette", 0, "wxPalette *", 0},{"_p_wxPalette"},{0}}; static swig_type_info _swigt__p_wxGLCanvas[] = {{"_p_wxGLCanvas", 0, "wxGLCanvas *", 0},{"_p_wxGLCanvas"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxGLContext[] = {{"_p_wxGLContext", 0, "wxGLContext *", 0},{"_p_wxGLContext"},{0}}; static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0},{"_p_int"},{0}}; @@ -1188,7 +1186,6 @@ _swigt__p_wxEvtHandler, _swigt__p_char, _swigt__p_wxPalette, _swigt__p_wxGLCanvas, -_swigt__p_wxString, _swigt__p_wxGLContext, _swigt__p_int, 0 diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp index 88bd5d9b71..f229e2f33b 100644 --- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp @@ -247,32 +247,31 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxScrolledWindow swig_types[14] #define SWIGTYPE_p_wxWindow swig_types[15] #define SWIGTYPE_p_double swig_types[16] -#define SWIGTYPE_p_wxPyDrawnShape swig_types[17] -#define SWIGTYPE_p_wxPyDivisionShape swig_types[18] +#define SWIGTYPE_p_wxPyDivisionShape swig_types[17] +#define SWIGTYPE_p_wxPyDrawnShape swig_types[18] #define SWIGTYPE_p_wxPyPolygonShape swig_types[19] #define SWIGTYPE_p_wxBitmap swig_types[20] #define SWIGTYPE_p_wxObject swig_types[21] #define SWIGTYPE_p_wxPyBitmapShape swig_types[22] -#define SWIGTYPE_p_wxString swig_types[23] -#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[24] -#define SWIGTYPE_p_wxEvtHandler swig_types[25] -#define SWIGTYPE_p_wxPyEllipseShape swig_types[26] -#define SWIGTYPE_p_wxPyShapeCanvas swig_types[27] -#define SWIGTYPE_p_wxPoint swig_types[28] -#define SWIGTYPE_p_wxDiagram swig_types[29] -#define SWIGTYPE_p_wxPyShape swig_types[30] -#define SWIGTYPE_p_wxAttachmentPoint swig_types[31] -#define SWIGTYPE_p_wxClassInfo swig_types[32] -#define SWIGTYPE_p_wxPyLineShape swig_types[33] -#define SWIGTYPE_p_wxPyRectangleShape swig_types[34] -#define SWIGTYPE_p_wxPyCompositeShape swig_types[35] -#define SWIGTYPE_p_wxPyCircleShape swig_types[36] -#define SWIGTYPE_p_wxPen swig_types[37] -#define SWIGTYPE_p_int swig_types[38] -#define SWIGTYPE_p_wxPseudoMetaFile swig_types[39] -#define SWIGTYPE_p_wxPyTextShape swig_types[40] -#define SWIGTYPE_p_wxPyDividedShape swig_types[41] -static swig_type_info *swig_types[43]; +#define SWIGTYPE_p_wxPyShapeEvtHandler swig_types[23] +#define SWIGTYPE_p_wxEvtHandler swig_types[24] +#define SWIGTYPE_p_wxPyEllipseShape swig_types[25] +#define SWIGTYPE_p_wxPyShapeCanvas swig_types[26] +#define SWIGTYPE_p_wxPoint swig_types[27] +#define SWIGTYPE_p_wxDiagram swig_types[28] +#define SWIGTYPE_p_wxPyShape swig_types[29] +#define SWIGTYPE_p_wxAttachmentPoint swig_types[30] +#define SWIGTYPE_p_wxClassInfo swig_types[31] +#define SWIGTYPE_p_wxPyLineShape swig_types[32] +#define SWIGTYPE_p_wxPyRectangleShape swig_types[33] +#define SWIGTYPE_p_wxPyCompositeShape swig_types[34] +#define SWIGTYPE_p_wxPyCircleShape swig_types[35] +#define SWIGTYPE_p_wxPen swig_types[36] +#define SWIGTYPE_p_int swig_types[37] +#define SWIGTYPE_p_wxPseudoMetaFile swig_types[38] +#define SWIGTYPE_p_wxPyTextShape swig_types[39] +#define SWIGTYPE_p_wxPyDividedShape swig_types[40] +static swig_type_info *swig_types[42]; /* -------- TYPES TABLE (END) -------- */ @@ -393,15 +392,6 @@ SWIG_PyObj_AsBool(PyObject *obj) } -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape); PyObject *wxPyShape_GetChildren(wxPyShape *self){ @@ -2598,7 +2588,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3576,7 +3566,7 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyFloat_FromDouble((double) (*arg6)); resultobj = t_output_helper(resultobj,o); @@ -4019,7 +4009,7 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4223,7 +4213,7 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4349,7 +4339,7 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4374,7 +4364,7 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4399,7 +4389,7 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4601,7 +4591,7 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4626,7 +4616,7 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4681,7 +4671,7 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4787,7 +4777,7 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg4)); resultobj = t_output_helper(resultobj,o); @@ -4850,7 +4840,7 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4905,7 +4895,7 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4985,7 +4975,7 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5236,7 +5226,7 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5616,7 +5606,7 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6612,7 +6602,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6676,7 +6666,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6759,7 +6749,7 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyFloat_FromDouble((double) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -6870,7 +6860,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7008,7 +6998,7 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7129,7 +7119,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7180,7 +7170,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7518,7 +7508,7 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7546,7 +7536,7 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8385,7 +8375,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9506,7 +9496,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9632,7 +9622,7 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9884,7 +9874,7 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11218,7 +11208,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12627,7 +12617,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14093,7 +14083,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15501,7 +15491,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -16423,7 +16413,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17272,7 +17262,7 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17345,7 +17335,7 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17596,7 +17586,7 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17776,7 +17766,7 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18300,7 +18290,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19701,7 +19691,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21842,7 +21832,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23171,7 +23161,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24492,7 +24482,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26039,7 +26029,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -26155,7 +26145,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26194,7 +26184,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -26227,7 +26217,7 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26897,7 +26887,7 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26922,7 +26912,7 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27391,7 +27381,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27945,7 +27935,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29558,7 +29548,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30911,7 +30901,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32048,7 +32038,7 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32073,7 +32063,7 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32749,7 +32739,7 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35097,13 +35087,12 @@ static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0},{"_p_wxScrolledWindow"},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxScrolledWindow},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxWindow},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_double[] = {{"_p_double", 0, "double *", 0},{"_p_double"},{0}}; -static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}}; static swig_type_info _swigt__p_wxPyDivisionShape[] = {{"_p_wxPyDivisionShape", 0, "wxPyDivisionShape *", 0},{"_p_wxPyDivisionShape"},{0}}; +static swig_type_info _swigt__p_wxPyDrawnShape[] = {{"_p_wxPyDrawnShape", 0, "wxPyDrawnShape *", 0},{"_p_wxPyDrawnShape"},{0}}; static swig_type_info _swigt__p_wxPyPolygonShape[] = {{"_p_wxPyPolygonShape", 0, "wxPyPolygonShape *", 0},{"_p_wxPyPolygonShape"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxQueryLayoutInfoEvent", _p_wxQueryLayoutInfoEventTo_p_wxObject},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxObject},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxObject},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxOGLConstraint", _p_wxOGLConstraintTo_p_wxObject},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxObject},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxObject},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxArrowHead", _p_wxArrowHeadTo_p_wxObject},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxFontData", _p_wxFontDataTo_p_wxObject},{"_p_wxPrintData", _p_wxPrintDataTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxObject},{"_p_wxLayoutAlgorithm", _p_wxLayoutAlgorithmTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxFindDialogEvent", _p_wxFindDialogEventTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxObject},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxSplitterEvent", _p_wxSplitterEventTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxFindReplaceData", _p_wxFindReplaceDataTo_p_wxObject},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxObject},{"_p_wxColourData", _p_wxColourDataTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxObject},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxObject},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxObject},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxObject},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxObject},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxObject},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxObject},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxObject},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxPrinter", _p_wxPrinterTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxCalculateLayoutEvent", _p_wxCalculateLayoutEventTo_p_wxObject},{"_p_wxPyShapeEvtHandler", _p_wxPyShapeEvtHandlerTo_p_wxObject},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxObject},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxObject},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxObject},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxFrame", _p_wxFrameTo_p_wxObject},{"_p_wxPyPrintout", _p_wxPyPrintoutTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxTaskBarIconEvent", _p_wxTaskBarIconEventTo_p_wxObject},{"_p_wxDiagram", _p_wxDiagramTo_p_wxObject},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxObject},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxObject},{"_p_wxObject"},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxObject},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxObject},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxObject},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxObject},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxObject},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxObject},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxObject},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxObject},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxObject},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxObject},{"_p_wxSashEvent", _p_wxSashEventTo_p_wxObject},{"_p_wxPrintPreview", _p_wxPrintPreviewTo_p_wxObject},{"_p_wxPyPrintPreview", _p_wxPyPrintPreviewTo_p_wxObject},{"_p_wxPanel", _p_wxPanelTo_p_wxObject},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxObject},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxObject},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxObject},{"_p_wxDialog", _p_wxDialogTo_p_wxObject},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxObject},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxObject},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxObject},{"_p_wxAttachmentPoint", _p_wxAttachmentPointTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxObject},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxObject},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxObject},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxObject},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxObject},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxPseudoMetaFile", _p_wxPseudoMetaFileTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxPageSetupDialogData", _p_wxPageSetupDialogDataTo_p_wxObject},{"_p_wxPrintDialogData", _p_wxPrintDialogDataTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{"_p_wxShapeRegion", _p_wxShapeRegionTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxPyBitmapShape[] = {{"_p_wxPyBitmapShape", 0, "wxPyBitmapShape *", 0},{"_p_wxPyBitmapShape"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxPyShapeEvtHandler[] = {{"_p_wxPyShapeEvtHandler", 0, "wxPyShapeEvtHandler *", 0},{"_p_wxPyControlPoint", _p_wxPyControlPointTo_p_wxPyShapeEvtHandler},{"_p_wxPyRectangleShape", _p_wxPyRectangleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCompositeShape", _p_wxPyCompositeShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyLineShape", _p_wxPyLineShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDividedShape", _p_wxPyDividedShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyEllipseShape", _p_wxPyEllipseShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyPolygonShape", _p_wxPyPolygonShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDrawnShape", _p_wxPyDrawnShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyDivisionShape", _p_wxPyDivisionShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShape", _p_wxPyShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyShapeEvtHandler"},{"_p_wxPyBitmapShape", _p_wxPyBitmapShapeTo_p_wxPyShapeEvtHandler},{"_p_wxPyTextShape", _p_wxPyTextShapeTo_p_wxPyShapeEvtHandler},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyShapeCanvas", _p_wxPyShapeCanvasTo_p_wxEvtHandler},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler},{"_p_wxTaskBarIcon", _p_wxTaskBarIconTo_p_wxEvtHandler},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxPyEllipseShape[] = {{"_p_wxPyEllipseShape", 0, "wxPyEllipseShape *", 0},{"_p_wxPyCircleShape", _p_wxPyCircleShapeTo_p_wxPyEllipseShape},{"_p_wxPyEllipseShape"},{0}}; @@ -35141,13 +35130,12 @@ _swigt__p_wxFont, _swigt__p_wxScrolledWindow, _swigt__p_wxWindow, _swigt__p_double, -_swigt__p_wxPyDrawnShape, _swigt__p_wxPyDivisionShape, +_swigt__p_wxPyDrawnShape, _swigt__p_wxPyPolygonShape, _swigt__p_wxBitmap, _swigt__p_wxObject, _swigt__p_wxPyBitmapShape, -_swigt__p_wxString, _swigt__p_wxPyShapeEvtHandler, _swigt__p_wxEvtHandler, _swigt__p_wxPyEllipseShape, diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp index 7d37ee0fc9..d8cd150941 100644 --- a/wxPython/src/mac/calendar_wrap.cpp +++ b/wxPython/src/mac/calendar_wrap.cpp @@ -238,14 +238,13 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxWindow swig_types[5] #define SWIGTYPE_p_wxCommandEvent swig_types[6] #define SWIGTYPE_p_char swig_types[7] -#define SWIGTYPE_p_wxString swig_types[8] -#define SWIGTYPE_p_wxEvtHandler swig_types[9] -#define SWIGTYPE_p_wxFont swig_types[10] -#define SWIGTYPE_p_wxDateTime swig_types[11] -#define SWIGTYPE_p_wxControl swig_types[12] -#define SWIGTYPE_p_wxCalendarCtrl swig_types[13] -#define SWIGTYPE_p_wxEvent swig_types[14] -static swig_type_info *swig_types[16]; +#define SWIGTYPE_p_wxEvtHandler swig_types[8] +#define SWIGTYPE_p_wxFont swig_types[9] +#define SWIGTYPE_p_wxDateTime swig_types[10] +#define SWIGTYPE_p_wxControl swig_types[11] +#define SWIGTYPE_p_wxCalendarCtrl swig_types[12] +#define SWIGTYPE_p_wxEvent swig_types[13] +static swig_type_info *swig_types[15]; /* -------- TYPES TABLE (END) -------- */ @@ -315,15 +314,6 @@ SWIG_PyObj_AsBool(PyObject *obj) return PyObject_IsTrue(obj) ? true : false; } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - static const wxString wxPyCalendarNameStr(wxCalendarNameStr); SWIGSTATIC(long) @@ -640,7 +630,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -665,7 +655,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -690,7 +680,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -715,7 +705,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -740,7 +730,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -765,7 +755,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1276,7 +1266,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -1376,7 +1366,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1438,7 +1428,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1509,7 +1499,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2092,7 +2082,7 @@ static PyObject *_wrap_CalendarCtrl_Enable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2125,7 +2115,7 @@ static PyObject *_wrap_CalendarCtrl_Show(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2716,7 +2706,6 @@ static swig_type_info _swigt__p_wxCalendarDateAttr[] = {{"_p_wxCalendarDateAttr" static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxCalendarEvent", _p_wxCalendarEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{0}}; static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0},{"_p_char"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxPyTimer", _p_wxPyTimerTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{"_p_wxCalendarCtrl", _p_wxCalendarCtrlTo_p_wxEvtHandler},{"_p_wxPyProcess", _p_wxPyProcessTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0},{"_p_wxDateTime"},{0}}; @@ -2733,7 +2722,6 @@ _swigt__p_wxCalendarDateAttr, _swigt__p_wxWindow, _swigt__p_wxCommandEvent, _swigt__p_char, -_swigt__p_wxString, _swigt__p_wxEvtHandler, _swigt__p_wxFont, _swigt__p_wxDateTime, diff --git a/wxPython/src/mac/controls.py b/wxPython/src/mac/controls.py index 43ae90077a..e8b575b954 100644 --- a/wxPython/src/mac/controls.py +++ b/wxPython/src/mac/controls.py @@ -289,7 +289,7 @@ class Choice(core.ControlWithItems): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> Choice """ @@ -302,7 +302,7 @@ class Choice(core.ControlWithItems): def Create(*args, **kwargs): """ Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> bool """ @@ -352,7 +352,7 @@ class ComboBox(core.Control,core.ItemContainer): """ __init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ComboBoxNameStr) -> ComboBox """ @@ -366,7 +366,7 @@ class ComboBox(core.Control,core.ItemContainer): """ Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ComboBoxNameStr) -> bool """ @@ -715,7 +715,7 @@ class ListBox(core.ControlWithItems): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ListBoxNameStr) -> ListBox """ @@ -728,7 +728,7 @@ class ListBox(core.ControlWithItems): def Create(*args, **kwargs): """ Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ListBoxNameStr) -> bool """ @@ -817,7 +817,7 @@ class CheckListBox(ListBox): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ListBoxNameStr) -> CheckListBox """ @@ -830,7 +830,7 @@ class CheckListBox(ListBox): def Create(*args, **kwargs): """ Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - int choices=0, String choices_array=None, + wxArrayString choices=wxPyEmptyStringArray, long style=0, Validator validator=DefaultValidator, String name=ListBoxNameStr) -> bool """ @@ -904,6 +904,11 @@ TEXT_ATTR_ALIGNMENT = _controls.TEXT_ATTR_ALIGNMENT TEXT_ATTR_LEFT_INDENT = _controls.TEXT_ATTR_LEFT_INDENT TEXT_ATTR_RIGHT_INDENT = _controls.TEXT_ATTR_RIGHT_INDENT TEXT_ATTR_TABS = _controls.TEXT_ATTR_TABS +TE_HT_UNKNOWN = _controls.TE_HT_UNKNOWN +TE_HT_BEFORE = _controls.TE_HT_BEFORE +TE_HT_ON_TEXT = _controls.TE_HT_ON_TEXT +TE_HT_BELOW = _controls.TE_HT_BELOW +TE_HT_BEYOND = _controls.TE_HT_BEYOND class TextAttr(object): def __repr__(self): return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -1194,6 +1199,16 @@ class TextCtrl(core.Control): """ShowPosition(long pos)""" return _controls.TextCtrl_ShowPosition(*args, **kwargs) + def HitTest(*args, **kwargs): + """ + HitTest(Point pt) -> (result, row, col) + + Find the character at position given in pixels. + NB: pt is in device coords (not adjusted for the client area + origin nor scrolling) + """ + return _controls.TextCtrl_HitTest(*args, **kwargs) + def Copy(*args, **kwargs): """Copy()""" return _controls.TextCtrl_Copy(*args, **kwargs) @@ -1577,8 +1592,8 @@ class RadioBox(core.Control): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, String label, Point pos=DefaultPosition, - Size size=DefaultSize, int choices=0, - String choices_array=None, int majorDimension=0, + Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, + int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, String name=RadioBoxNameStr) -> RadioBox """ @@ -1592,8 +1607,8 @@ class RadioBox(core.Control): def Create(*args, **kwargs): """ Create(Window parent, int id, String label, Point pos=DefaultPosition, - Size size=DefaultSize, int choices=0, - String choices_array=None, int majorDimension=0, + Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, + int majorDimension=0, long style=RA_HORIZONTAL, Validator validator=DefaultValidator, String name=RadioBoxNameStr) -> bool """ diff --git a/wxPython/src/mac/controls_wrap.cpp b/wxPython/src/mac/controls_wrap.cpp index 880cca9407..b1ff16faa2 100644 --- a/wxPython/src/mac/controls_wrap.cpp +++ b/wxPython/src/mac/controls_wrap.cpp @@ -370,6 +370,9 @@ static swig_type_info *swig_types[85]; static const wxString wxPyPanelNameStr(wxPanelNameStr); static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyControlNameStr(wxControlNameStr); + + const wxArrayString wxPyEmptyStringArray; + static const wxString wxPyButtonNameStr(wxButtonNameStr); SWIGSTATIC(int) @@ -386,15 +389,6 @@ SWIG_PyObj_AsLong(PyObject * obj) return PyInt_Check(obj) ? PyInt_AsLong(obj) : PyLong_AsLong(obj); } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - static const wxString wxPyCheckBoxNameStr(wxCheckBoxNameStr); SWIGSTATIC(bool) @@ -1106,7 +1100,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1386,7 +1380,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp9) delete arg9; @@ -1958,7 +1952,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1999,7 +1993,7 @@ static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2024,7 +2018,7 @@ static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2134,7 +2128,7 @@ static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2159,7 +2153,7 @@ static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2201,13 +2195,13 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyChoiceNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyChoiceNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxChoice *result; wxPoint temp3 ; wxSize temp4 ; @@ -2244,53 +2238,67 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj5) { { - arg7 = (long) SWIG_PyObj_AsLong(obj5); + arg6 = (long) SWIG_PyObj_AsLong(obj5); if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { - if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg8 == NULL) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChoice *)new wxChoice(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxChoice *)new wxChoice(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxChoice, 1); { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -2327,13 +2335,13 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyChoiceNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyChoiceNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; @@ -2372,53 +2380,67 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj6) { { - arg8 = (long) SWIG_PyObj_AsLong(obj6); + arg7 = (long) SWIG_PyObj_AsLong(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { - if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg9 == NULL) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -2634,13 +2656,13 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyComboBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyComboBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; wxComboBox *result; bool temp3 = False ; wxPoint temp4 ; @@ -2686,33 +2708,47 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj6) { { - arg8 = (long) SWIG_PyObj_AsLong(obj6); + arg7 = (long) SWIG_PyObj_AsLong(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { - if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg9 == NULL) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxComboBox *)new wxComboBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (wxComboBox *)new wxComboBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -2723,11 +2759,11 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: @@ -2736,11 +2772,11 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -2779,13 +2815,13 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxSize const &arg6_defvalue = wxDefaultSize ; wxSize *arg6 = (wxSize *) &arg6_defvalue ; - int arg7 = (int) 0 ; - wxString *arg8 = (wxString *) NULL ; - long arg9 = (long) 0 ; - wxValidator const &arg10_defvalue = wxDefaultValidator ; - wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; - wxString const &arg11_defvalue = wxPyComboBoxNameStr ; - wxString *arg11 = (wxString *) &arg11_defvalue ; + wxArrayString const &arg7_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg7 = (wxArrayString *) &arg7_defvalue ; + long arg8 = (long) 0 ; + wxValidator const &arg9_defvalue = wxDefaultValidator ; + wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; + wxString const &arg10_defvalue = wxPyComboBoxNameStr ; + wxString *arg10 = (wxString *) &arg10_defvalue ; bool result; bool temp4 = False ; wxPoint temp5 ; @@ -2833,48 +2869,62 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject } if (obj6) { { - arg7 = PyList_Size(obj6); - arg8 = wxString_LIST_helper(obj6); - if (arg8 == NULL) SWIG_fail; + if (! PySequence_Check(obj6)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg7 = new wxArrayString; + int i, len=PySequence_Length(obj6); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj7) { { - arg9 = (long) SWIG_PyObj_AsLong(obj7); + arg8 = (long) SWIG_PyObj_AsLong(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { - if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg10 == NULL) { + if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg9 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj9) { { - arg11 = wxString_in_helper(obj9); - if (arg11 == NULL) SWIG_fail; + arg10 = wxString_in_helper(obj9); + if (arg10 == NULL) SWIG_fail; temp10 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); + result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,(wxArrayString const &)*arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; } { - if (arg8) delete [] arg8; + if (arg7) delete arg7; } { if (temp10) - delete arg11; + delete arg10; } return resultobj; fail: @@ -2883,11 +2933,11 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject delete arg4; } { - if (arg8) delete [] arg8; + if (arg7) delete arg7; } { if (temp10) - delete arg11; + delete arg10; } return NULL; } @@ -3547,7 +3597,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp9) delete arg9; @@ -3690,7 +3740,7 @@ static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4068,7 +4118,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4264,7 +4314,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -4297,7 +4347,7 @@ static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4523,7 +4573,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4731,7 +4781,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -4870,13 +4920,13 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyListBoxNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyListBoxNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxListBox *result; wxPoint temp3 ; wxSize temp4 ; @@ -4913,53 +4963,67 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj5) { { - arg7 = (long) SWIG_PyObj_AsLong(obj5); + arg6 = (long) SWIG_PyObj_AsLong(obj5); if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { - if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg8 == NULL) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxListBox *)new wxListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxListBox *)new wxListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxListBox, 1); { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -4996,13 +5060,13 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyListBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyListBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; @@ -5041,53 +5105,67 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject * } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj6) { { - arg8 = (long) SWIG_PyObj_AsLong(obj6); + arg7 = (long) SWIG_PyObj_AsLong(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { - if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg9 == NULL) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -5276,7 +5354,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5447,7 +5525,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5645,7 +5723,7 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5667,13 +5745,13 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject wxPoint *arg3 = (wxPoint *) &arg3_defvalue ; wxSize const &arg4_defvalue = wxDefaultSize ; wxSize *arg4 = (wxSize *) &arg4_defvalue ; - int arg5 = (int) 0 ; - wxString *arg6 = (wxString *) NULL ; - long arg7 = (long) 0 ; - wxValidator const &arg8_defvalue = wxDefaultValidator ; - wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; - wxString const &arg9_defvalue = wxPyListBoxNameStr ; - wxString *arg9 = (wxString *) &arg9_defvalue ; + wxArrayString const &arg5_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg5 = (wxArrayString *) &arg5_defvalue ; + long arg6 = (long) 0 ; + wxValidator const &arg7_defvalue = wxDefaultValidator ; + wxValidator *arg7 = (wxValidator *) &arg7_defvalue ; + wxString const &arg8_defvalue = wxPyListBoxNameStr ; + wxString *arg8 = (wxString *) &arg8_defvalue ; wxCheckListBox *result; wxPoint temp3 ; wxSize temp4 ; @@ -5710,53 +5788,67 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject } if (obj4) { { - arg5 = PyList_Size(obj4); - arg6 = wxString_LIST_helper(obj4); - if (arg6 == NULL) SWIG_fail; + if (! PySequence_Check(obj4)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg5 = new wxArrayString; + int i, len=PySequence_Length(obj4); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj5) { { - arg7 = (long) SWIG_PyObj_AsLong(obj5); + arg6 = (long) SWIG_PyObj_AsLong(obj5); if (PyErr_Occurred()) SWIG_fail; } } if (obj6) { - if ((SWIG_ConvertPtr(obj6,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg8 == NULL) { + if ((SWIG_ConvertPtr(obj6,(void **) &arg7, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg7 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj7) { { - arg9 = wxString_in_helper(obj7); - if (arg9 == NULL) SWIG_fail; + arg8 = wxString_in_helper(obj7); + if (arg8 == NULL) SWIG_fail; temp8 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCheckListBox *)new wxCheckListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,arg5,arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); + result = (wxCheckListBox *)new wxCheckListBox(arg1,arg2,(wxPoint const &)*arg3,(wxSize const &)*arg4,(wxArrayString const &)*arg5,arg6,(wxValidator const &)*arg7,(wxString const &)*arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCheckListBox, 1); { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return resultobj; fail: { - if (arg6) delete [] arg6; + if (arg5) delete arg5; } { if (temp8) - delete arg9; + delete arg8; } return NULL; } @@ -5793,13 +5885,13 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - long arg8 = (long) 0 ; - wxValidator const &arg9_defvalue = wxDefaultValidator ; - wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; - wxString const &arg10_defvalue = wxPyListBoxNameStr ; - wxString *arg10 = (wxString *) &arg10_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + long arg7 = (long) 0 ; + wxValidator const &arg8_defvalue = wxDefaultValidator ; + wxValidator *arg8 = (wxValidator *) &arg8_defvalue ; + wxString const &arg9_defvalue = wxPyListBoxNameStr ; + wxString *arg9 = (wxString *) &arg9_defvalue ; bool result; wxPoint temp4 ; wxSize temp5 ; @@ -5838,53 +5930,67 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj6) { { - arg8 = (long) SWIG_PyObj_AsLong(obj6); + arg7 = (long) SWIG_PyObj_AsLong(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { - if ((SWIG_ConvertPtr(obj7,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg9 == NULL) { + if ((SWIG_ConvertPtr(obj7,(void **) &arg8, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg8 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj8) { { - arg10 = wxString_in_helper(obj8); - if (arg10 == NULL) SWIG_fail; + arg9 = wxString_in_helper(obj8); + if (arg9 == NULL) SWIG_fail; temp9 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); + result = (bool)(arg1)->Create(arg2,arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,(wxValidator const &)*arg8,(wxString const &)*arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return resultobj; fail: { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp9) - delete arg10; + delete arg9; } return NULL; } @@ -5914,7 +6020,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6523,7 +6629,7 @@ static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6548,7 +6654,7 @@ static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6573,7 +6679,7 @@ static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6598,7 +6704,7 @@ static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6623,7 +6729,7 @@ static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6648,7 +6754,7 @@ static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6673,7 +6779,7 @@ static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6704,7 +6810,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6949,7 +7055,7 @@ static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7222,7 +7328,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -7470,7 +7576,7 @@ static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7495,7 +7601,7 @@ static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7520,7 +7626,7 @@ static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7545,7 +7651,7 @@ static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7759,7 +7865,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7803,7 +7909,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8000,7 +8106,7 @@ static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8043,7 +8149,7 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8080,7 +8186,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8111,7 +8217,7 @@ static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8257,6 +8363,52 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO } +static PyObject *_wrap_TextCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; + wxPoint *arg2 = 0 ; + long *arg3 = (long *) 0 ; + long *arg4 = (long *) 0 ; + int result; + wxPoint temp2 ; + long temp3 ; + long temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt", NULL + }; + + arg3 = &temp3; + arg4 = &temp4; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxTextCtrl const *)arg1)->HitTest((wxPoint const &)*arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_PyObj_FromInt((int)result); + { + PyObject *o = PyInt_FromLong((long) (*arg3)); + resultobj = t_output_helper(resultobj,o); + } + { + PyObject *o = PyInt_FromLong((long) (*arg4)); + resultobj = t_output_helper(resultobj,o); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_TextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTextCtrl *arg1 = (wxTextCtrl *) 0 ; @@ -8347,7 +8499,7 @@ static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8372,7 +8524,7 @@ static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8397,7 +8549,7 @@ static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8470,7 +8622,7 @@ static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8495,7 +8647,7 @@ static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9125,7 +9277,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -9258,7 +9410,7 @@ static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9568,7 +9720,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -9802,7 +9954,7 @@ static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10064,7 +10216,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -10460,14 +10612,14 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw wxPoint *arg4 = (wxPoint *) &arg4_defvalue ; wxSize const &arg5_defvalue = wxDefaultSize ; wxSize *arg5 = (wxSize *) &arg5_defvalue ; - int arg6 = (int) 0 ; - wxString *arg7 = (wxString *) NULL ; - int arg8 = (int) 0 ; - long arg9 = (long) wxRA_HORIZONTAL ; - wxValidator const &arg10_defvalue = wxDefaultValidator ; - wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; - wxString const &arg11_defvalue = wxPyRadioBoxNameStr ; - wxString *arg11 = (wxString *) &arg11_defvalue ; + wxArrayString const &arg6_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg6 = (wxArrayString *) &arg6_defvalue ; + int arg7 = (int) 0 ; + long arg8 = (long) wxRA_HORIZONTAL ; + wxValidator const &arg9_defvalue = wxDefaultValidator ; + wxValidator *arg9 = (wxValidator *) &arg9_defvalue ; + wxString const &arg10_defvalue = wxPyRadioBoxNameStr ; + wxString *arg10 = (wxString *) &arg10_defvalue ; wxRadioBox *result; bool temp3 = False ; wxPoint temp4 ; @@ -10512,39 +10664,53 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw } if (obj5) { { - arg6 = PyList_Size(obj5); - arg7 = wxString_LIST_helper(obj5); - if (arg7 == NULL) SWIG_fail; + if (! PySequence_Check(obj5)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg6 = new wxArrayString; + int i, len=PySequence_Length(obj5); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj6) { { - arg8 = (int) SWIG_PyObj_AsInt(obj6); + arg7 = (int) SWIG_PyObj_AsInt(obj6); if (PyErr_Occurred()) SWIG_fail; } } if (obj7) { { - arg9 = (long) SWIG_PyObj_AsLong(obj7); + arg8 = (long) SWIG_PyObj_AsLong(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { - if ((SWIG_ConvertPtr(obj8,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg10 == NULL) { + if ((SWIG_ConvertPtr(obj8,(void **) &arg9, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg9 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj9) { { - arg11 = wxString_in_helper(obj9); - if (arg11 == NULL) SWIG_fail; + arg10 = wxString_in_helper(obj9); + if (arg10 == NULL) SWIG_fail; temp10 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxRadioBox *)new wxRadioBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); + result = (wxRadioBox *)new wxRadioBox(arg1,arg2,(wxString const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,(wxArrayString const &)*arg6,arg7,arg8,(wxValidator const &)*arg9,(wxString const &)*arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10555,11 +10721,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp10) - delete arg11; + delete arg10; } return resultobj; fail: @@ -10568,11 +10734,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw delete arg3; } { - if (arg7) delete [] arg7; + if (arg6) delete arg6; } { if (temp10) - delete arg11; + delete arg10; } return NULL; } @@ -10610,14 +10776,14 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject wxPoint *arg5 = (wxPoint *) &arg5_defvalue ; wxSize const &arg6_defvalue = wxDefaultSize ; wxSize *arg6 = (wxSize *) &arg6_defvalue ; - int arg7 = (int) 0 ; - wxString *arg8 = (wxString *) NULL ; - int arg9 = (int) 0 ; - long arg10 = (long) wxRA_HORIZONTAL ; - wxValidator const &arg11_defvalue = wxDefaultValidator ; - wxValidator *arg11 = (wxValidator *) &arg11_defvalue ; - wxString const &arg12_defvalue = wxPyRadioBoxNameStr ; - wxString *arg12 = (wxString *) &arg12_defvalue ; + wxArrayString const &arg7_defvalue = wxPyEmptyStringArray ; + wxArrayString *arg7 = (wxArrayString *) &arg7_defvalue ; + int arg8 = (int) 0 ; + long arg9 = (long) wxRA_HORIZONTAL ; + wxValidator const &arg10_defvalue = wxDefaultValidator ; + wxValidator *arg10 = (wxValidator *) &arg10_defvalue ; + wxString const &arg11_defvalue = wxPyRadioBoxNameStr ; + wxString *arg11 = (wxString *) &arg11_defvalue ; bool result; bool temp4 = False ; wxPoint temp5 ; @@ -10664,54 +10830,68 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject } if (obj6) { { - arg7 = PyList_Size(obj6); - arg8 = wxString_LIST_helper(obj6); - if (arg8 == NULL) SWIG_fail; + if (! PySequence_Check(obj6)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg7 = new wxArrayString; + int i, len=PySequence_Length(obj6); + for (i=0; iAdd(Py2wxString(str)); + Py_DECREF(item); + Py_DECREF(str); + } } } if (obj7) { { - arg9 = (int) SWIG_PyObj_AsInt(obj7); + arg8 = (int) SWIG_PyObj_AsInt(obj7); if (PyErr_Occurred()) SWIG_fail; } } if (obj8) { { - arg10 = (long) SWIG_PyObj_AsLong(obj8); + arg9 = (long) SWIG_PyObj_AsLong(obj8); if (PyErr_Occurred()) SWIG_fail; } } if (obj9) { - if ((SWIG_ConvertPtr(obj9,(void **) &arg11, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg11 == NULL) { + if ((SWIG_ConvertPtr(obj9,(void **) &arg10, SWIGTYPE_p_wxValidator,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg10 == NULL) { PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } if (obj10) { { - arg12 = wxString_in_helper(obj10); - if (arg12 == NULL) SWIG_fail; + arg11 = wxString_in_helper(obj10); + if (arg11 == NULL) SWIG_fail; temp11 = True; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,arg7,arg8,arg9,arg10,(wxValidator const &)*arg11,(wxString const &)*arg12); + result = (bool)(arg1)->Create(arg2,arg3,(wxString const &)*arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,(wxArrayString const &)*arg7,arg8,arg9,(wxValidator const &)*arg10,(wxString const &)*arg11); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; } { - if (arg8) delete [] arg8; + if (arg7) delete arg7; } { if (temp11) - delete arg12; + delete arg11; } return resultobj; fail: @@ -10720,11 +10900,11 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject delete arg4; } { - if (arg8) delete [] arg8; + if (arg7) delete arg7; } { if (temp11) - delete arg12; + delete arg11; } return NULL; } @@ -10842,7 +11022,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -11390,7 +11570,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -11431,7 +11611,7 @@ static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11715,7 +11895,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp11) delete arg11; @@ -12617,7 +12797,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -12811,7 +12991,7 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12909,7 +13089,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12940,7 +13120,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12965,7 +13145,7 @@ static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13017,7 +13197,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -13083,7 +13263,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -13509,7 +13689,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -13920,7 +14100,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -13953,7 +14133,7 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14472,7 +14652,7 @@ static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14497,7 +14677,7 @@ static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14522,7 +14702,7 @@ static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14731,7 +14911,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14786,7 +14966,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14819,7 +14999,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14860,7 +15040,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -15603,7 +15783,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15634,7 +15814,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15683,7 +15863,7 @@ static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15917,7 +16097,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15948,7 +16128,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16651,7 +16831,7 @@ static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16835,7 +17015,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -17077,7 +17257,7 @@ static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17102,7 +17282,7 @@ static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17127,7 +17307,7 @@ static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18027,7 +18207,7 @@ static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19219,7 +19399,7 @@ static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19451,7 +19631,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -19521,7 +19701,7 @@ static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19553,7 +19733,7 @@ static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19623,7 +19803,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19691,7 +19871,7 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19817,7 +19997,7 @@ static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19958,7 +20138,7 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20001,7 +20181,7 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20152,7 +20332,7 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20268,7 +20448,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20734,7 +20914,7 @@ static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20833,7 +21013,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20864,7 +21044,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20889,7 +21069,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20920,7 +21100,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20945,7 +21125,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21030,7 +21210,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21540,7 +21720,7 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21712,7 +21892,7 @@ static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21941,7 +22121,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -22129,7 +22309,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22293,7 +22473,7 @@ static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22321,7 +22501,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22349,7 +22529,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22964,7 +23144,7 @@ static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23240,7 +23420,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -24191,7 +24371,7 @@ static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24222,7 +24402,7 @@ static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24253,7 +24433,7 @@ static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24284,7 +24464,7 @@ static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24315,7 +24495,7 @@ static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25898,7 +26078,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -25955,7 +26135,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -26191,7 +26371,7 @@ static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26657,7 +26837,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27224,7 +27404,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27249,7 +27429,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27274,7 +27454,7 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27299,7 +27479,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27324,7 +27504,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27765,7 +27945,7 @@ static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27790,7 +27970,7 @@ static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -27974,7 +28154,7 @@ static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28411,7 +28591,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28449,7 +28629,7 @@ static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28474,7 +28654,7 @@ static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28506,7 +28686,7 @@ static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28531,7 +28711,7 @@ static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28556,7 +28736,7 @@ static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28630,7 +28810,7 @@ static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28681,7 +28861,7 @@ static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28732,7 +28912,7 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28930,6 +29110,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"TextCtrl_HitTest", (PyCFunction) _wrap_TextCtrl_HitTest, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS }, @@ -30785,6 +30966,11 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"TEXT_ATTR_LEFT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_LEFT_INDENT)); PyDict_SetItemString(d,"TEXT_ATTR_RIGHT_INDENT", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_RIGHT_INDENT)); PyDict_SetItemString(d,"TEXT_ATTR_TABS", SWIG_PyObj_FromInt((int)wxTEXT_ATTR_TABS)); + PyDict_SetItemString(d,"TE_HT_UNKNOWN", SWIG_PyObj_FromInt((int)wxTE_HT_UNKNOWN)); + PyDict_SetItemString(d,"TE_HT_BEFORE", SWIG_PyObj_FromInt((int)wxTE_HT_BEFORE)); + PyDict_SetItemString(d,"TE_HT_ON_TEXT", SWIG_PyObj_FromInt((int)wxTE_HT_ON_TEXT)); + PyDict_SetItemString(d,"TE_HT_BELOW", SWIG_PyObj_FromInt((int)wxTE_HT_BELOW)); + PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_PyObj_FromInt((int)wxTE_HT_BEYOND)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL)); diff --git a/wxPython/src/mac/core_wrap.cpp b/wxPython/src/mac/core_wrap.cpp index ae0e9d17d5..2c79f39b98 100644 --- a/wxPython/src/mac/core_wrap.cpp +++ b/wxPython/src/mac/core_wrap.cpp @@ -273,11 +273,11 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxArrayString swig_types[40] #define SWIGTYPE_p_wxShowEvent swig_types[41] #define SWIGTYPE_p_wxToolTip swig_types[42] -#define SWIGTYPE_p_wxIconizeEvent swig_types[43] -#define SWIGTYPE_p_wxActivateEvent swig_types[44] -#define SWIGTYPE_p_wxMoveEvent swig_types[45] -#define SWIGTYPE_p_wxSizeEvent swig_types[46] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[47] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[43] +#define SWIGTYPE_p_wxIconizeEvent swig_types[44] +#define SWIGTYPE_p_wxActivateEvent swig_types[45] +#define SWIGTYPE_p_wxMoveEvent swig_types[46] +#define SWIGTYPE_p_wxSizeEvent swig_types[47] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[48] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[49] #define SWIGTYPE_p_wxIdleEvent swig_types[50] @@ -293,15 +293,15 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxPNGHandler swig_types[60] #define SWIGTYPE_p_wxANIHandler swig_types[61] #define SWIGTYPE_p_wxMemoryFSHandler swig_types[62] -#define SWIGTYPE_p_wxZipFSHandler swig_types[63] -#define SWIGTYPE_p_wxEvtHandler swig_types[64] -#define SWIGTYPE_p_wxCURHandler swig_types[65] -#define SWIGTYPE_p_wxICOHandler swig_types[66] -#define SWIGTYPE_p_wxBMPHandler swig_types[67] -#define SWIGTYPE_p_wxImageHandler swig_types[68] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[69] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[70] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] +#define SWIGTYPE_p_wxEvtHandler swig_types[63] +#define SWIGTYPE_p_wxCURHandler swig_types[64] +#define SWIGTYPE_p_wxICOHandler swig_types[65] +#define SWIGTYPE_p_wxBMPHandler swig_types[66] +#define SWIGTYPE_p_wxImageHandler swig_types[67] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[68] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[69] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[70] +#define SWIGTYPE_p_wxZipFSHandler swig_types[71] #define SWIGTYPE_p_wxRect swig_types[72] #define SWIGTYPE_p_wxGBSpan swig_types[73] #define SWIGTYPE_p_wxPropagateOnce swig_types[74] @@ -325,27 +325,26 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxWindowDestroyEvent swig_types[92] #define SWIGTYPE_p_wxWindow swig_types[93] #define SWIGTYPE_p_wxMenuBar swig_types[94] -#define SWIGTYPE_p_wxString swig_types[95] -#define SWIGTYPE_p_wxFileSystem swig_types[96] -#define SWIGTYPE_p_wxBitmap swig_types[97] -#define SWIGTYPE_p_wxMenuEvent swig_types[98] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[99] -#define SWIGTYPE_p_unsigned_char swig_types[100] -#define SWIGTYPE_p_wxCloseEvent swig_types[101] -#define SWIGTYPE_p_wxEraseEvent swig_types[102] -#define SWIGTYPE_p_wxMouseEvent swig_types[103] -#define SWIGTYPE_p_wxPyApp swig_types[104] -#define SWIGTYPE_p_wxCommandEvent swig_types[105] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[106] -#define SWIGTYPE_p_wxPyDropTarget swig_types[107] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[108] -#define SWIGTYPE_p_wxFocusEvent swig_types[109] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[110] -#define SWIGTYPE_p_wxControlWithItems swig_types[111] -#define SWIGTYPE_p_wxColour swig_types[112] -#define SWIGTYPE_p_wxValidator swig_types[113] -#define SWIGTYPE_p_wxPyValidator swig_types[114] -static swig_type_info *swig_types[116]; +#define SWIGTYPE_p_wxFileSystem swig_types[95] +#define SWIGTYPE_p_wxBitmap swig_types[96] +#define SWIGTYPE_p_wxMenuEvent swig_types[97] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[98] +#define SWIGTYPE_p_unsigned_char swig_types[99] +#define SWIGTYPE_p_wxCloseEvent swig_types[100] +#define SWIGTYPE_p_wxEraseEvent swig_types[101] +#define SWIGTYPE_p_wxMouseEvent swig_types[102] +#define SWIGTYPE_p_wxPyApp swig_types[103] +#define SWIGTYPE_p_wxCommandEvent swig_types[104] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[105] +#define SWIGTYPE_p_wxPyDropTarget swig_types[106] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[107] +#define SWIGTYPE_p_wxFocusEvent swig_types[108] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[109] +#define SWIGTYPE_p_wxControlWithItems swig_types[110] +#define SWIGTYPE_p_wxColour swig_types[111] +#define SWIGTYPE_p_wxValidator swig_types[112] +#define SWIGTYPE_p_wxPyValidator swig_types[113] +static swig_type_info *swig_types[115]; /* -------- TYPES TABLE (END) -------- */ @@ -640,15 +639,6 @@ SWIG_PyObj_AsInt(PyObject *obj) SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - PyObject *wxSize_Get(wxSize *self){ wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); @@ -1748,7 +1738,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1780,7 +1770,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2276,7 +2266,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2308,7 +2298,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2632,7 +2622,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2664,7 +2654,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3989,7 +3979,7 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4021,7 +4011,7 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4058,7 +4048,7 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4090,7 +4080,7 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4122,7 +4112,7 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5029,7 +5019,7 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5061,7 +5051,7 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5349,7 +5339,7 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5611,7 +5601,7 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5636,7 +5626,7 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5667,7 +5657,7 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6161,7 +6151,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6997,7 +6987,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7116,7 +7106,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7496,7 +7486,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -7797,7 +7787,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8082,7 +8072,7 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -8939,7 +8929,7 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8997,7 +8987,7 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -9058,7 +9048,7 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9088,7 +9078,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -9191,7 +9181,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9248,7 +9238,7 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9303,7 +9293,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9352,7 +9342,7 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9408,7 +9398,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (created1) delete arg1; @@ -9475,7 +9465,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (created2) delete arg2; @@ -9542,7 +9532,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (created2) delete arg2; @@ -9583,7 +9573,7 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10122,7 +10112,7 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10581,7 +10571,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -10731,7 +10721,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -11461,7 +11451,7 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11522,7 +11512,7 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11668,7 +11658,7 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11994,7 +11984,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12051,7 +12041,7 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12076,7 +12066,7 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12440,7 +12430,7 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12465,7 +12455,7 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12718,7 +12708,7 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13116,7 +13106,7 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13149,7 +13139,7 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13182,7 +13172,7 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13215,7 +13205,7 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13246,7 +13236,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13277,7 +13267,7 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13327,7 +13317,7 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13352,7 +13342,7 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13377,7 +13367,7 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13402,7 +13392,7 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13427,7 +13417,7 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13452,7 +13442,7 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13477,7 +13467,7 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13502,7 +13492,7 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13527,7 +13517,7 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13552,7 +13542,7 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13577,7 +13567,7 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13602,7 +13592,7 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13627,7 +13617,7 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13652,7 +13642,7 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13677,7 +13667,7 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13702,7 +13692,7 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13727,7 +13717,7 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13752,7 +13742,7 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13777,7 +13767,7 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13802,7 +13792,7 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14054,7 +14044,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14189,7 +14179,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_leftDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14234,7 +14224,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *arg if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_middleDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14279,7 +14269,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_rightDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14324,7 +14314,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *ar if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14369,7 +14359,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14414,7 +14404,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14459,7 +14449,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMouseEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14772,7 +14762,7 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14834,7 +14824,7 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14859,7 +14849,7 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14884,7 +14874,7 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14909,7 +14899,7 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14934,7 +14924,7 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15331,7 +15321,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_controlDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15376,7 +15366,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args, if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_shiftDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15421,7 +15411,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, Py if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_altDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15466,7 +15456,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_metaDown); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15511,7 +15501,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxKeyEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool) ((arg1)->m_scanCode); - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16476,7 +16466,7 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16613,7 +16603,7 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16740,7 +16730,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16827,7 +16817,7 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16852,7 +16842,7 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16952,7 +16942,7 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17022,7 +17012,7 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17207,7 +17197,7 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17232,7 +17222,7 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17288,7 +17278,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17313,7 +17303,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17338,7 +17328,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17512,7 +17502,7 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17892,7 +17882,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17946,7 +17936,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18001,7 +17991,7 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18407,7 +18397,7 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18481,7 +18471,7 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19106,7 +19096,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19228,7 +19218,7 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19253,7 +19243,7 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19278,7 +19268,7 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19312,7 +19302,7 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19337,7 +19327,7 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19446,7 +19436,7 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19501,7 +19491,7 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19633,7 +19623,7 @@ static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19968,7 +19958,7 @@ static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19990,7 +19980,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20025,7 +20015,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20464,7 +20454,7 @@ static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20720,7 +20710,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -20761,7 +20751,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20786,7 +20776,7 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20811,7 +20801,7 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20836,7 +20826,7 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22546,7 +22536,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22571,7 +22561,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22604,7 +22594,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22629,7 +22619,7 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22654,7 +22644,7 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22679,7 +22669,7 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22820,7 +22810,7 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22845,7 +22835,7 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22987,7 +22977,7 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23012,7 +23002,7 @@ static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23109,7 +23099,7 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23134,7 +23124,7 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23322,7 +23312,7 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23350,7 +23340,7 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23624,7 +23614,7 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23779,7 +23769,7 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23810,7 +23800,7 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24159,7 +24149,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24463,7 +24453,7 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24495,7 +24485,7 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24527,7 +24517,7 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24559,7 +24549,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24591,7 +24581,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24680,7 +24670,7 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24739,7 +24729,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25361,7 +25351,7 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25396,7 +25386,7 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25452,7 +25442,7 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25717,7 +25707,7 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25748,7 +25738,7 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25773,7 +25763,7 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25798,7 +25788,7 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25823,7 +25813,7 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25848,7 +25838,7 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26212,7 +26202,7 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26237,7 +26227,7 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26629,7 +26619,7 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26654,7 +26644,7 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26679,7 +26669,7 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26755,7 +26745,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28097,7 +28087,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28125,7 +28115,7 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28180,7 +28170,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28208,7 +28198,7 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28432,7 +28422,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -28499,7 +28489,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29001,7 +28991,7 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29130,7 +29120,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -29180,7 +29170,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -29398,7 +29388,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29715,7 +29705,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29746,7 +29736,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -29964,7 +29954,7 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30244,7 +30234,7 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30473,7 +30463,7 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30498,7 +30488,7 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30609,7 +30599,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -30666,7 +30656,7 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -31118,7 +31108,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp8) delete arg8; @@ -31487,7 +31477,7 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32321,7 +32311,7 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32346,7 +32336,7 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32371,7 +32361,7 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -32758,7 +32748,7 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -33048,7 +33038,7 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -33696,7 +33686,7 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35003,7 +34993,7 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35035,7 +35025,7 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35287,7 +35277,7 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35319,7 +35309,7 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35688,7 +35678,7 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35720,7 +35710,7 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35748,7 +35738,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_0(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -35784,7 +35774,7 @@ static PyObject *_wrap_GBSizerItem_Intersects__SWIG_1(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36049,7 +36039,7 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36077,7 +36067,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36352,7 +36342,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36384,7 +36374,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36419,7 +36409,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36742,7 +36732,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36774,7 +36764,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -36809,7 +36799,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -37209,7 +37199,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_0(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -37250,7 +37240,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection__SWIG_1(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -37971,7 +37961,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -38084,7 +38074,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -38115,7 +38105,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -38372,7 +38362,7 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -38401,7 +38391,7 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -40162,11 +40152,11 @@ static swig_type_info _swigt__p_wxAppTraits[] = {{"_p_wxAppTraits", 0, "wxAppTra static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0},{"_p_wxArrayString"},{0}}; static swig_type_info _swigt__p_wxShowEvent[] = {{"_p_wxShowEvent", 0, "wxShowEvent *", 0},{"_p_wxShowEvent"},{0}}; static swig_type_info _swigt__p_wxToolTip[] = {{"_p_wxToolTip", 0, "wxToolTip *", 0},{"_p_wxToolTip"},{0}}; +static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxIconizeEvent[] = {{"_p_wxIconizeEvent", 0, "wxIconizeEvent *", 0},{"_p_wxIconizeEvent"},{0}}; static swig_type_info _swigt__p_wxActivateEvent[] = {{"_p_wxActivateEvent", 0, "wxActivateEvent *", 0},{"_p_wxActivateEvent"},{0}}; static swig_type_info _swigt__p_wxMoveEvent[] = {{"_p_wxMoveEvent", 0, "wxMoveEvent *", 0},{"_p_wxMoveEvent"},{0}}; static swig_type_info _swigt__p_wxSizeEvent[] = {{"_p_wxSizeEvent", 0, "wxSizeEvent *", 0},{"_p_wxSizeEvent"},{0}}; -static swig_type_info _swigt__p_wxMaximizeEvent[] = {{"_p_wxMaximizeEvent", 0, "wxMaximizeEvent *", 0},{"_p_wxMaximizeEvent"},{0}}; static swig_type_info _swigt__p_wxQueryNewPaletteEvent[] = {{"_p_wxQueryNewPaletteEvent", 0, "wxQueryNewPaletteEvent *", 0},{"_p_wxQueryNewPaletteEvent"},{0}}; static swig_type_info _swigt__p_wxWindowCreateEvent[] = {{"_p_wxWindowCreateEvent", 0, "wxWindowCreateEvent *", 0},{"_p_wxWindowCreateEvent"},{0}}; static swig_type_info _swigt__p_wxIdleEvent[] = {{"_p_wxIdleEvent", 0, "wxIdleEvent *", 0},{"_p_wxIdleEvent"},{0}}; @@ -40182,7 +40172,6 @@ static swig_type_info _swigt__p_wxGIFHandler[] = {{"_p_wxGIFHandler", 0, "wxGIFH static swig_type_info _swigt__p_wxPNGHandler[] = {{"_p_wxPNGHandler", 0, "wxPNGHandler *", 0},{"_p_wxPNGHandler"},{0}}; static swig_type_info _swigt__p_wxANIHandler[] = {{"_p_wxANIHandler", 0, "wxANIHandler *", 0},{"_p_wxANIHandler"},{0}}; static swig_type_info _swigt__p_wxMemoryFSHandler[] = {{"_p_wxMemoryFSHandler", 0, "wxMemoryFSHandler *", 0},{"_p_wxMemoryFSHandler"},{0}}; -static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler},{"_p_wxEvtHandler"},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler},{0}}; static swig_type_info _swigt__p_wxCURHandler[] = {{"_p_wxCURHandler", 0, "wxCURHandler *", 0},{"_p_wxCURHandler"},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxCURHandler},{0}}; static swig_type_info _swigt__p_wxICOHandler[] = {{"_p_wxICOHandler", 0, "wxICOHandler *", 0},{"_p_wxICOHandler"},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxICOHandler},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxICOHandler},{0}}; @@ -40191,6 +40180,7 @@ static swig_type_info _swigt__p_wxImageHandler[] = {{"_p_wxImageHandler", 0, "wx static swig_type_info _swigt__p_wxFileSystemHandler[] = {{"_p_wxFileSystemHandler", 0, "wxFileSystemHandler *", 0},{"_p_wxFileSystemHandler"},{"_p_wxPyFileSystemHandler", _p_wxPyFileSystemHandlerTo_p_wxFileSystemHandler},{"_p_wxInternetFSHandler", _p_wxInternetFSHandlerTo_p_wxFileSystemHandler},{"_p_wxZipFSHandler", _p_wxZipFSHandlerTo_p_wxFileSystemHandler},{"_p_wxMemoryFSHandler", _p_wxMemoryFSHandlerTo_p_wxFileSystemHandler},{0}}; static swig_type_info _swigt__p_wxPyFileSystemHandler[] = {{"_p_wxPyFileSystemHandler", 0, "wxPyFileSystemHandler *", 0},{"_p_wxPyFileSystemHandler"},{0}}; static swig_type_info _swigt__p_wxInternetFSHandler[] = {{"_p_wxInternetFSHandler", 0, "wxInternetFSHandler *", 0},{"_p_wxInternetFSHandler"},{0}}; +static swig_type_info _swigt__p_wxZipFSHandler[] = {{"_p_wxZipFSHandler", 0, "wxZipFSHandler *", 0},{"_p_wxZipFSHandler"},{0}}; static swig_type_info _swigt__p_wxRect[] = {{"_p_wxRect", 0, "wxRect *", 0},{"_p_wxRect"},{0}}; static swig_type_info _swigt__p_wxGBSpan[] = {{"_p_wxGBSpan", 0, "wxGBSpan *", 0},{"_p_wxGBSpan"},{0}}; static swig_type_info _swigt__p_wxPropagateOnce[] = {{"_p_wxPropagateOnce", 0, "wxPropagateOnce *", 0},{"_p_wxPropagateOnce"},{0}}; @@ -40214,7 +40204,6 @@ static swig_type_info _swigt__p_wxNavigationKeyEvent[] = {{"_p_wxNavigationKeyEv static swig_type_info _swigt__p_wxWindowDestroyEvent[] = {{"_p_wxWindowDestroyEvent", 0, "wxWindowDestroyEvent *", 0},{"_p_wxWindowDestroyEvent"},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{0}}; static swig_type_info _swigt__p_wxMenuBar[] = {{"_p_wxMenuBar", 0, "wxMenuBar *", 0},{"_p_wxMenuBar"},{0}}; -static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0},{"_p_wxString"},{0}}; static swig_type_info _swigt__p_wxFileSystem[] = {{"_p_wxFileSystem", 0, "wxFileSystem *", 0},{"_p_wxFileSystem"},{0}}; static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0},{"_p_wxMenuEvent"},{0}}; @@ -40279,11 +40268,11 @@ _swigt__p_wxAppTraits, _swigt__p_wxArrayString, _swigt__p_wxShowEvent, _swigt__p_wxToolTip, +_swigt__p_wxMaximizeEvent, _swigt__p_wxIconizeEvent, _swigt__p_wxActivateEvent, _swigt__p_wxMoveEvent, _swigt__p_wxSizeEvent, -_swigt__p_wxMaximizeEvent, _swigt__p_wxQueryNewPaletteEvent, _swigt__p_wxWindowCreateEvent, _swigt__p_wxIdleEvent, @@ -40299,7 +40288,6 @@ _swigt__p_wxGIFHandler, _swigt__p_wxPNGHandler, _swigt__p_wxANIHandler, _swigt__p_wxMemoryFSHandler, -_swigt__p_wxZipFSHandler, _swigt__p_wxEvtHandler, _swigt__p_wxCURHandler, _swigt__p_wxICOHandler, @@ -40308,6 +40296,7 @@ _swigt__p_wxImageHandler, _swigt__p_wxFileSystemHandler, _swigt__p_wxPyFileSystemHandler, _swigt__p_wxInternetFSHandler, +_swigt__p_wxZipFSHandler, _swigt__p_wxRect, _swigt__p_wxGBSpan, _swigt__p_wxPropagateOnce, @@ -40331,7 +40320,6 @@ _swigt__p_wxNavigationKeyEvent, _swigt__p_wxWindowDestroyEvent, _swigt__p_wxWindow, _swigt__p_wxMenuBar, -_swigt__p_wxString, _swigt__p_wxFileSystem, _swigt__p_wxBitmap, _swigt__p_wxMenuEvent, diff --git a/wxPython/src/mac/gdi_wrap.cpp b/wxPython/src/mac/gdi_wrap.cpp index a50c7c808c..ff2cbf659e 100644 --- a/wxPython/src/mac/gdi_wrap.cpp +++ b/wxPython/src/mac/gdi_wrap.cpp @@ -342,15 +342,6 @@ static swig_type_info *swig_types[57]; static const wxString wxPyEmptyString(wxEmptyString); -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - SWIGSTATIC(bool) SWIG_PyObj_AsBool(PyObject *obj) { @@ -795,7 +786,7 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -850,7 +841,7 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1093,7 +1084,7 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1197,7 +1188,7 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1229,7 +1220,7 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1445,7 +1436,7 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg3)); resultobj = t_output_helper(resultobj,o); @@ -1482,7 +1473,7 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1712,7 +1703,7 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2303,7 +2294,7 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2636,7 +2627,7 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2903,7 +2894,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -2950,7 +2941,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -2989,7 +2980,7 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3368,7 +3359,7 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3667,7 +3658,7 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4262,7 +4253,7 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4688,7 +4679,7 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4720,7 +4711,7 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4751,7 +4742,7 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4776,7 +4767,7 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4825,7 +4816,7 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4857,7 +4848,7 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4888,7 +4879,7 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4937,7 +4928,7 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4969,7 +4960,7 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5000,7 +4991,7 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5049,7 +5040,7 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5081,7 +5072,7 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5112,7 +5103,7 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5190,7 +5181,7 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5453,7 +5444,7 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5526,7 +5517,7 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5733,7 +5724,7 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6059,7 +6050,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6162,7 +6153,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6393,7 +6384,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6495,7 +6486,7 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6950,7 +6941,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -7297,7 +7288,7 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7328,7 +7319,7 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7359,7 +7350,7 @@ static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7484,7 +7475,7 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7590,7 +7581,7 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8132,7 +8123,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8311,7 +8302,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8347,7 +8338,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8719,7 +8710,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8784,7 +8775,7 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8881,7 +8872,7 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9069,7 +9060,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9110,7 +9101,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9497,13 +9488,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { if (argc == 1) { int _v; { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { return _wrap_GetTranslation__SWIG_0(self,args); @@ -9512,23 +9497,11 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) { if (argc == 3) { int _v; { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { { @@ -9636,7 +9609,7 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9795,7 +9768,7 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9926,7 +9899,7 @@ static PyObject *_wrap_DC_FloodFillXY(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9973,7 +9946,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11492,7 +11465,7 @@ static PyObject *_wrap_DC_BlitXY(PyObject *self, PyObject *args, PyObject *kwarg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11567,7 +11540,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11912,7 +11885,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -13074,7 +13047,7 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13099,7 +13072,7 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13178,7 +13151,7 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13988,7 +13961,7 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14683,7 +14656,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14713,7 +14686,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14738,7 +14711,7 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15412,7 +15385,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15477,7 +15450,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15533,7 +15506,7 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15558,7 +15531,7 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17388,7 +17361,7 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index 5333a2707c..12bec787a8 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -899,15 +899,6 @@ void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){ self->SetClientObject(new wxPyOORClientData(_self)); } -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - class wxPyGridCellEditor : public wxGridCellEditor { public: @@ -2146,7 +2137,7 @@ static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2457,7 +2448,7 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2639,7 +2630,7 @@ static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2937,7 +2928,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4066,7 +4057,7 @@ static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4091,7 +4082,7 @@ static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4116,7 +4107,7 @@ static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4141,7 +4132,7 @@ static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4166,7 +4157,7 @@ static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4191,7 +4182,7 @@ static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4216,7 +4207,7 @@ static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4241,7 +4232,7 @@ static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4429,7 +4420,7 @@ static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4538,7 +4529,7 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5283,7 +5274,7 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5466,7 +5457,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -5519,7 +5510,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -5638,7 +5629,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5829,7 +5820,7 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5862,7 +5853,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5903,7 +5894,7 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5944,7 +5935,7 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5977,7 +5968,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6018,7 +6009,7 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6209,7 +6200,7 @@ static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6530,7 +6521,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -6583,7 +6574,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -6656,7 +6647,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6689,7 +6680,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6730,7 +6721,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6771,7 +6762,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6804,7 +6795,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6845,7 +6836,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7036,7 +7027,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7774,7 +7765,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7805,7 +7796,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7962,7 +7953,7 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8098,7 +8089,7 @@ static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8169,7 +8160,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8242,7 +8233,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8283,7 +8274,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8332,7 +8323,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8381,7 +8372,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8422,7 +8413,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8471,7 +8462,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8811,7 +8802,7 @@ static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8922,7 +8913,7 @@ static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8947,7 +8938,7 @@ static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8972,7 +8963,7 @@ static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8997,7 +8988,7 @@ static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9370,7 +9361,7 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9473,7 +9464,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9504,7 +9495,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9535,7 +9526,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9566,7 +9557,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9591,7 +9582,7 @@ static PyObject *_wrap_Grid_MovePageDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9616,7 +9607,7 @@ static PyObject *_wrap_Grid_MovePageUp(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9647,7 +9638,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9678,7 +9669,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9709,7 +9700,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9740,7 +9731,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10759,7 +10750,7 @@ static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10840,7 +10831,7 @@ static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10921,7 +10912,7 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11235,7 +11226,7 @@ static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11670,7 +11661,7 @@ static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11707,7 +11698,7 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13131,7 +13122,7 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13356,7 +13347,7 @@ static PyObject *_wrap_Grid_IsSelection(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13417,7 +13408,7 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14397,7 +14388,7 @@ static PyObject *_wrap_GridEvent_Selecting(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14422,7 +14413,7 @@ static PyObject *_wrap_GridEvent_ControlDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14447,7 +14438,7 @@ static PyObject *_wrap_GridEvent_MetaDown(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14472,7 +14463,7 @@ static PyObject *_wrap_GridEvent_ShiftDown(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14497,7 +14488,7 @@ static PyObject *_wrap_GridEvent_AltDown(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14676,7 +14667,7 @@ static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14701,7 +14692,7 @@ static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14726,7 +14717,7 @@ static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14751,7 +14742,7 @@ static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15032,7 +15023,7 @@ static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15057,7 +15048,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15082,7 +15073,7 @@ static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15107,7 +15098,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15132,7 +15123,7 @@ static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp index 774feda9e2..7a3d6e23c1 100644 --- a/wxPython/src/mac/html_wrap.cpp +++ b/wxPython/src/mac/html_wrap.cpp @@ -347,15 +347,6 @@ static swig_type_info *swig_types[53]; static const wxString wxPyHtmlPrintoutTitleStr(wxT("Printout")); static const wxString wxPyHtmlPrintingTitleStr(wxT("Printing")); -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - SWIGSTATIC(int) SWIG_PyObj_AsInt(PyObject *obj) { @@ -1068,7 +1059,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -1187,7 +1178,7 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3170,7 +3161,7 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4140,7 +4131,7 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4465,7 +4456,7 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { PyObject *o = PyInt_FromLong((long) (*arg2)); resultobj = t_output_helper(resultobj,o); @@ -4524,7 +4515,7 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4549,7 +4540,7 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4726,7 +4717,7 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5704,7 +5695,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -5775,7 +5766,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5816,7 +5807,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5857,7 +5848,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5898,7 +5889,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6313,7 +6304,7 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6338,7 +6329,7 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6363,7 +6354,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6388,7 +6379,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6495,7 +6486,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -6536,7 +6527,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -8620,7 +8611,7 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8645,7 +8636,7 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8880,7 +8871,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9386,7 +9377,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9696,7 +9687,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -9855,7 +9846,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; diff --git a/wxPython/src/mac/misc.py b/wxPython/src/mac/misc.py index a1b704a01d..56bec85b75 100644 --- a/wxPython/src/mac/misc.py +++ b/wxPython/src/mac/misc.py @@ -2012,43 +2012,69 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN, #--------------------------------------------------------------------------- -class Wave(object): +SOUND_SYNC = _misc.SOUND_SYNC +SOUND_ASYNC = _misc.SOUND_ASYNC +SOUND_LOOP = _misc.SOUND_LOOP +class Sound(object): def __repr__(self): - return "<%s.%s; proxy of C++ wxWave instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(String fileName, bool isResource=False) -> Wave""" - newobj = _misc.new_Wave(*args, **kwargs) + return "<%s.%s; proxy of C++ wxSound instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args): + """ + __init__() -> Sound + __init__(String fileName, bool isResource=false) -> Sound + __init__(int size, wxByte data) -> Sound + """ + newobj = _misc.new_Sound(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown - def __del__(self, destroy=_misc.delete_Wave): + def __del__(self, destroy=_misc.delete_Sound): """__del__()""" try: if self.thisown: destroy(self) except: pass + def Create(*args): + """ + Create(String fileName, bool isResource=false) -> bool + Create(int size, wxByte data) -> bool + """ + return _misc.Sound_Create(*args) + def IsOk(*args, **kwargs): """IsOk() -> bool""" - return _misc.Wave_IsOk(*args, **kwargs) + return _misc.Sound_IsOk(*args, **kwargs) - def Play(*args, **kwargs): - """Play(bool async=True, bool looped=False) -> bool""" - return _misc.Wave_Play(*args, **kwargs) + def Play(*args): + """Play(unsigned int flags=SOUND_ASYNC) -> bool""" + return _misc.Sound_Play(*args) + def PlaySound(*args): + """PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" + return _misc.Sound_PlaySound(*args) + + PlaySound = staticmethod(PlaySound) + def Stop(*args, **kwargs): + """Stop()""" + return _misc.Sound_Stop(*args, **kwargs) + + Stop = staticmethod(Stop) def __nonzero__(self): return self.IsOk() -class WavePtr(Wave): +class SoundPtr(Sound): def __init__(self, this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = Wave -_misc.Wave_swigregister(WavePtr) + self.__class__ = Sound +_misc.Sound_swigregister(SoundPtr) -def WaveData(*args, **kwargs): - """WaveData(String data) -> Wave""" - val = _misc.new_WaveData(*args, **kwargs) - val.thisown = 1 - return val +def Sound_PlaySound(*args): + """Sound_PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool""" + return _misc.Sound_PlaySound(*args) + +def Sound_Stop(*args, **kwargs): + """Sound_Stop()""" + return _misc.Sound_Stop(*args, **kwargs) #--------------------------------------------------------------------------- diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp index 0419861ac4..907d541933 100644 --- a/wxPython/src/mac/misc_wrap.cpp +++ b/wxPython/src/mac/misc_wrap.cpp @@ -239,33 +239,33 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxMenu swig_types[6] #define SWIGTYPE_p_wxEvent swig_types[7] #define SWIGTYPE_p_wxConfigBase swig_types[8] -#define SWIGTYPE_p_wxWave swig_types[9] -#define SWIGTYPE_p_wxFileType swig_types[10] -#define SWIGTYPE_p_wxLogGui swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxDataFormat swig_types[13] -#define SWIGTYPE_p_wxTimerEvent swig_types[14] -#define SWIGTYPE_p_wxCaret swig_types[15] -#define SWIGTYPE_p_int swig_types[16] -#define SWIGTYPE_p_wxSize swig_types[17] -#define SWIGTYPE_p_wxClipboard swig_types[18] -#define SWIGTYPE_p_wxStopWatch swig_types[19] -#define SWIGTYPE_p_wxDC swig_types[20] -#define SWIGTYPE_p_wxClipboardLocker swig_types[21] -#define SWIGTYPE_p_wxIcon swig_types[22] -#define SWIGTYPE_p_wxLogStderr swig_types[23] -#define SWIGTYPE_p_wxLogTextCtrl swig_types[24] -#define SWIGTYPE_p_wxTextCtrl swig_types[25] -#define SWIGTYPE_p_wxBusyCursor swig_types[26] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[28] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[29] -#define SWIGTYPE_p_wxTextDataObject swig_types[30] -#define SWIGTYPE_p_wxDataObject swig_types[31] -#define SWIGTYPE_p_wxFileDataObject swig_types[32] -#define SWIGTYPE_p_wxCustomDataObject swig_types[33] -#define SWIGTYPE_p_wxURLDataObject swig_types[34] -#define SWIGTYPE_p_wxMetafileDataObject swig_types[35] +#define SWIGTYPE_p_wxFileType swig_types[9] +#define SWIGTYPE_p_wxLogGui swig_types[10] +#define SWIGTYPE_p_wxFont swig_types[11] +#define SWIGTYPE_p_wxDataFormat swig_types[12] +#define SWIGTYPE_p_wxTimerEvent swig_types[13] +#define SWIGTYPE_p_wxCaret swig_types[14] +#define SWIGTYPE_p_int swig_types[15] +#define SWIGTYPE_p_wxSize swig_types[16] +#define SWIGTYPE_p_wxClipboard swig_types[17] +#define SWIGTYPE_p_wxStopWatch swig_types[18] +#define SWIGTYPE_p_wxDC swig_types[19] +#define SWIGTYPE_p_wxClipboardLocker swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxLogStderr swig_types[22] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[23] +#define SWIGTYPE_p_wxTextCtrl swig_types[24] +#define SWIGTYPE_p_wxBusyCursor swig_types[25] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[26] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxTextDataObject swig_types[28] +#define SWIGTYPE_p_wxDataObject swig_types[29] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[30] +#define SWIGTYPE_p_wxFileDataObject swig_types[31] +#define SWIGTYPE_p_wxCustomDataObject swig_types[32] +#define SWIGTYPE_p_wxURLDataObject swig_types[33] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[34] +#define SWIGTYPE_p_wxSound swig_types[35] #define SWIGTYPE_p_wxTimerRunner swig_types[36] #define SWIGTYPE_p_wxLogWindow swig_types[37] #define SWIGTYPE_p_wxTimeSpan swig_types[38] @@ -311,10 +311,11 @@ SWIGIMPORT(float) SWIG_PyObj_AsFloatConv(PyObject *obj, py_objasdbl_co #define SWIGTYPE_p_wxPyLog swig_types[78] #define SWIGTYPE_p_wxLogNull swig_types[79] #define SWIGTYPE_p_wxColour swig_types[80] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[81] -#define SWIGTYPE_p_wxPyTimer swig_types[82] -#define SWIGTYPE_p_wxDateSpan swig_types[83] -static swig_type_info *swig_types[85]; +#define SWIGTYPE_p_wxByte swig_types[81] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[82] +#define SWIGTYPE_p_wxPyTimer swig_types[83] +#define SWIGTYPE_p_wxDateSpan swig_types[84] +static swig_type_info *swig_types[86]; /* -------- TYPES TABLE (END) -------- */ @@ -380,15 +381,6 @@ SWIG_PyObj_AsInt(PyObject *obj) SWIG_PyObj_AsLongInRange(obj, "int", INT_MIN, INT_MAX)); } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -681,38 +673,52 @@ public: #endif -#include +#include #if !wxUSE_SOUND // A C++ stub class for wxWave for platforms that don't have it. -class wxWave : public wxObject +class wxSound : public wxObject { public: - wxWave(const wxString& fileName, bool isResource = False) { + wxSound() { wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, - "wxWave is not available on this platform."); + "wxSound is not available on this platform."); wxPyEndBlockThreads(); } - wxWave(int size, const wxByte* data) { + wxSound(const wxString&, bool) { wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, - "wxWave is not available on this platform."); + "wxSound is not available on this platform."); wxPyEndBlockThreads(); } + wxSound(int, const wxByte*) { + wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxSound is not available on this platform."); + wxPyEndBlockThreads(); + } + + ~wxSound() {}; - ~wxWave() {} - - bool IsOk() const { return False; } - bool Play(bool async = True, bool looped = False) const { return False; } + bool Create(const wxString&, bool) { return false; } + bool Create(int, const wxByte*) { return false; }; + bool IsOk() { return false; }; + bool Play(unsigned) const { return false; } + static bool Play(const wxString&, unsigned) { return false; } + static void Stop() {} }; #endif -wxWave *new_wxWave(wxString const &data){ - return new wxWave(data.Len(), (wxByte*)data.c_str()); +bool wxSound_Create__SWIG_1(wxSound *self,int size,wxByte const *data){ + wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "Create from data is not available on this platform."); + wxPyEndBlockThreads(); } +void Sound_Stop(){} #include @@ -1358,7 +1364,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1644,7 +1650,7 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -1919,7 +1925,7 @@ static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1980,7 +1986,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -2123,7 +2129,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3560,7 +3566,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3995,7 +4001,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4133,7 +4139,7 @@ static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4413,7 +4419,7 @@ static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4438,7 +4444,7 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5694,7 +5700,7 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -5735,7 +5741,7 @@ static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6013,7 +6019,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6222,7 +6228,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6271,7 +6277,7 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6321,7 +6327,7 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6670,7 +6676,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6700,7 +6706,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7142,7 +7148,7 @@ static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7189,7 +7195,7 @@ static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7548,7 +7554,7 @@ static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7692,7 +7698,7 @@ static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8264,23 +8270,11 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { if (argc == 2) { int _v; { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { return _wrap_LogTrace__SWIG_1(self,args); @@ -8300,13 +8294,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) { } if (_v) { { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxString, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); } if (_v) { return _wrap_LogTrace__SWIG_0(self,args); @@ -8584,7 +8572,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8780,7 +8768,7 @@ static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8942,7 +8930,7 @@ static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8967,7 +8955,7 @@ static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8992,7 +8980,7 @@ static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9581,7 +9569,7 @@ static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10162,7 +10150,7 @@ static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10187,7 +10175,7 @@ static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10212,7 +10200,7 @@ static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10237,7 +10225,7 @@ static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10262,7 +10250,7 @@ static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10287,7 +10275,7 @@ static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10312,7 +10300,7 @@ static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10348,7 +10336,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10373,7 +10361,7 @@ static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10961,7 +10949,7 @@ static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10986,7 +10974,7 @@ static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11011,7 +10999,7 @@ static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11044,7 +11032,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11077,7 +11065,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11110,7 +11098,7 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11124,19 +11112,35 @@ static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Sound__SWIG_0(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSound *result; + + if(!PyArg_ParseTuple(args,(char *)":new_Sound")) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSound *)new wxSound(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_Sound__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxString *arg1 = 0 ; - bool arg2 = (bool) False ; - wxWave *result; + bool arg2 = (bool) false ; + wxSound *result; bool temp1 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "fileName",(char *) "isResource", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_Wave",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|O:new_Sound",&obj0,&obj1)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -11150,12 +11154,12 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWave *)new wxWave((wxString const &)*arg1,arg2); + result = (wxSound *)new wxSound((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWave, 1); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); { if (temp1) delete arg1; @@ -11170,54 +11174,111 @@ static PyObject *_wrap_new_Wave(PyObject *self, PyObject *args, PyObject *kwargs } -static PyObject *_wrap_new_WaveData(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_Sound__SWIG_2(PyObject *self, PyObject *args) { PyObject *resultobj; - wxString *arg1 = 0 ; - wxWave *result; - bool temp1 = False ; + int arg1 ; + wxByte *arg2 = (wxByte *) 0 ; + wxSound *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "data", NULL - }; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_WaveData",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_Sound",&obj0,&obj1)) goto fail; { - arg1 = wxString_in_helper(obj0); - if (arg1 == NULL) SWIG_fail; - temp1 = True; + arg1 = (int) SWIG_PyObj_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; } + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxByte,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxWave *)new_wxWave((wxString const &)*arg1); + result = (wxSound *)new wxSound(arg1,(wxByte const *)arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxWave, 1); - { - if (temp1) - delete arg1; - } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSound, 1); return resultobj; fail: - { - if (temp1) - delete arg1; + return NULL; +} + + +static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 0) { + return _wrap_new_Sound__SWIG_0(self,args); } + if ((argc >= 1) && (argc <= 2)) { + int _v; + { + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); + } + if (_v) { + if (argc <= 1) { + return _wrap_new_Sound__SWIG_1(self,args); + } + { + SWIG_PyObj_AsBool(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_Sound__SWIG_1(self,args); + } + } + } + if (argc == 2) { + int _v; + { + SWIG_PyObj_AsInt(argv[0]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxByte, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_Sound__SWIG_2(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_Sound'"); return NULL; } -static PyObject *_wrap_delete_Wave(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; + wxSound *arg1 = (wxSound *) 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Wave",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_Sound",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); delete arg1; @@ -11232,76 +11293,292 @@ static PyObject *_wrap_delete_Wave(PyObject *self, PyObject *args, PyObject *kwa } -static PyObject *_wrap_Wave_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Sound_Create__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; + wxSound *arg1 = (wxSound *) 0 ; + wxString *arg2 = 0 ; + bool arg3 = (bool) false ; bool result; + bool temp2 = False ; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Wave_IsOk",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO|O:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + if (obj2) { + { + arg3 = (bool) SWIG_PyObj_AsBool(obj2); + if (PyErr_Occurred()) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxWave const *)arg1)->IsOk(); + result = (bool)(arg1)->Create((wxString const &)*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + if (temp2) + delete arg2; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } return NULL; } -static PyObject *_wrap_Wave_Play(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_Sound_Create__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; - wxWave *arg1 = (wxWave *) 0 ; - bool arg2 = (bool) True ; - bool arg3 = (bool) False ; + wxSound *arg1 = (wxSound *) 0 ; + int arg2 ; + wxByte *arg3 = (wxByte *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"OOO:Sound_Create",&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = (int) SWIG_PyObj_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + if ((SWIG_ConvertPtr(obj2,(void **) &arg3, SWIGTYPE_p_wxByte,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxSound_Create__SWIG_1(arg1,arg2,(wxByte const *)arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[4]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 3); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if ((argc >= 2) && (argc <= 3)) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxSound, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]); + } + if (_v) { + if (argc <= 2) { + return _wrap_Sound_Create__SWIG_0(self,args); + } + { + SWIG_PyObj_AsBool(argv[2]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_Sound_Create__SWIG_0(self,args); + } + } + } + } + if (argc == 3) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxSound, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + SWIG_PyObj_AsInt(argv[1]); + if (PyErr_Occurred()) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[2], (void **) &ptr, SWIGTYPE_p_wxByte, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_Sound_Create__SWIG_1(self,args); + } + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'Sound_Create'"); + return NULL; +} + + +static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSound *arg1 = (wxSound *) 0 ; + bool result; + PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "async",(char *) "looped", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Wave_Play",kwnames,&obj0,&obj1,&obj2)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWave,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sound_IsOk",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->IsOk(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxSound *arg1 = (wxSound *) 0 ; + unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_Play",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSound,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { { - arg2 = (bool) SWIG_PyObj_AsBool(obj1); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } } - if (obj2) { + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxSound const *)arg1)->Play(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args) { + PyObject *resultobj; + wxString *arg1 = 0 ; + unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ; + bool result; + bool temp1 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O|O:Sound_PlaySound",&obj0,&obj1)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = True; + } + if (obj1) { { - arg3 = (bool) SWIG_PyObj_AsBool(obj2); + arg2 = (unsigned int) SWIG_PyObj_AsUnsignedInt(obj1); if (PyErr_Occurred()) SWIG_fail; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->Play(arg2,arg3); + result = (bool)wxSound::Play((wxString const &)*arg1,arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + { + if (temp1) + delete arg1; + } return resultobj; fail: + { + if (temp1) + delete arg1; + } return NULL; } -static PyObject * Wave_swigregister(PyObject *self, PyObject *args) { +static PyObject *_wrap_Sound_Stop(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":Sound_Stop",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + Sound_Stop(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject * Sound_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxWave, obj); + SWIG_TypeClientData(SWIGTYPE_p_wxSound, obj); Py_INCREF(obj); return Py_BuildValue((char *)""); } @@ -11480,7 +11757,7 @@ static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12290,7 +12567,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -12350,7 +12627,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -12383,7 +12660,7 @@ static PyObject *_wrap_FileType_Unassociate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12521,7 +12798,7 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp1) delete arg1; @@ -12757,7 +13034,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -12798,7 +13075,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -12920,7 +13197,7 @@ static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13809,7 +14086,7 @@ static PyObject *_wrap_ArtProvider_PopProvider(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13834,7 +14111,7 @@ static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -14414,7 +14691,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14455,7 +14732,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14496,7 +14773,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14750,7 +15027,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14799,7 +15076,7 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14854,7 +15131,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14901,7 +15178,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14948,7 +15225,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -14989,7 +15266,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15030,7 +15307,7 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -15087,7 +15364,7 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -15144,7 +15421,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -15185,7 +15462,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp2) delete arg2; @@ -15218,7 +15495,7 @@ static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15243,7 +15520,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15332,7 +15609,7 @@ static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16126,7 +16403,7 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16252,7 +16529,7 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16537,7 +16814,7 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17709,7 +17986,7 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17756,7 +18033,7 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17854,7 +18131,7 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18418,7 +18695,7 @@ static PyObject *_wrap_DateTime_IsValid(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18943,7 +19220,7 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18974,7 +19251,7 @@ static PyObject *_wrap_DateTime_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19005,7 +19282,7 @@ static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19036,7 +19313,7 @@ static PyObject *_wrap_DateTime_IsLaterThan(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19073,7 +19350,7 @@ static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19110,7 +19387,7 @@ static PyObject *_wrap_DateTime_IsBetween(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19141,7 +19418,7 @@ static PyObject *_wrap_DateTime_IsSameDate(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19172,7 +19449,7 @@ static PyObject *_wrap_DateTime_IsSameTime(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19209,7 +19486,7 @@ static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19986,7 +20263,7 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20014,7 +20291,7 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20042,7 +20319,7 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20070,7 +20347,7 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20098,7 +20375,7 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20126,7 +20403,7 @@ static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) { wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21384,7 +21661,7 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21415,7 +21692,7 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21446,7 +21723,7 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21477,7 +21754,7 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21508,7 +21785,7 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21539,7 +21816,7 @@ static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21564,7 +21841,7 @@ static PyObject *_wrap_TimeSpan_IsNull(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21589,7 +21866,7 @@ static PyObject *_wrap_TimeSpan_IsPositive(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21614,7 +21891,7 @@ static PyObject *_wrap_TimeSpan_IsNegative(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21645,7 +21922,7 @@ static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21676,7 +21953,7 @@ static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21707,7 +21984,7 @@ static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22938,7 +23215,7 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -22969,7 +23246,7 @@ static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23193,7 +23470,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23221,7 +23498,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23249,7 +23526,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23344,7 +23621,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *self, PyObject *args) wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23691,7 +23968,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23791,7 +24068,7 @@ static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -23831,7 +24108,7 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24598,7 +24875,7 @@ static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -24871,7 +25148,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25138,7 +25415,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25425,7 +25702,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25450,7 +25727,7 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25656,7 +25933,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -25905,7 +26182,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26026,7 +26303,7 @@ static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26075,7 +26352,7 @@ static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26103,7 +26380,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26131,7 +26408,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26162,7 +26439,7 @@ static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26193,7 +26470,7 @@ static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26242,7 +26519,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26371,7 +26648,7 @@ static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -26716,12 +26993,14 @@ static PyMethodDef SwigMethods[] = { { (char *)"JoystickEvent_ButtonUp", (PyCFunction) _wrap_JoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_ButtonIsDown", (PyCFunction) _wrap_JoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS }, { (char *)"JoystickEvent_swigregister", JoystickEvent_swigregister, METH_VARARGS }, - { (char *)"new_Wave", (PyCFunction) _wrap_new_Wave, METH_VARARGS | METH_KEYWORDS }, - { (char *)"new_WaveData", (PyCFunction) _wrap_new_WaveData, METH_VARARGS | METH_KEYWORDS }, - { (char *)"delete_Wave", (PyCFunction) _wrap_delete_Wave, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_IsOk", (PyCFunction) _wrap_Wave_IsOk, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_Play", (PyCFunction) _wrap_Wave_Play, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Wave_swigregister", Wave_swigregister, METH_VARARGS }, + { (char *)"new_Sound", _wrap_new_Sound, METH_VARARGS }, + { (char *)"delete_Sound", (PyCFunction) _wrap_delete_Sound, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_Create", _wrap_Sound_Create, METH_VARARGS }, + { (char *)"Sound_IsOk", (PyCFunction) _wrap_Sound_IsOk, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_Play", _wrap_Sound_Play, METH_VARARGS }, + { (char *)"Sound_PlaySound", _wrap_Sound_PlaySound, METH_VARARGS }, + { (char *)"Sound_Stop", (PyCFunction) _wrap_Sound_Stop, METH_VARARGS | METH_KEYWORDS }, + { (char *)"Sound_swigregister", Sound_swigregister, METH_VARARGS }, { (char *)"new_FileTypeInfo", (PyCFunction) _wrap_new_FileTypeInfo, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_FileTypeInfoSequence", (PyCFunction) _wrap_new_FileTypeInfoSequence, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_NullFileTypeInfo", (PyCFunction) _wrap_new_NullFileTypeInfo, METH_VARARGS | METH_KEYWORDS }, @@ -27656,7 +27935,6 @@ static swig_type_info _swigt__p_wxDateTime__TimeZone[] = {{"_p_wxDateTime__TimeZ static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0},{"_p_wxMenu"},{0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxTimerEvent", _p_wxTimerEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxJoystickEvent", _p_wxJoystickEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxProcessEvent", _p_wxProcessEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; static swig_type_info _swigt__p_wxConfigBase[] = {{"_p_wxConfigBase", 0, "wxConfigBase *", 0},{"_p_wxFileConfig", _p_wxFileConfigTo_p_wxConfigBase},{"_p_wxConfigBase"},{"_p_wxConfig", _p_wxConfigTo_p_wxConfigBase},{0}}; -static swig_type_info _swigt__p_wxWave[] = {{"_p_wxWave", 0, "wxWave *", 0},{"_p_wxWave"},{0}}; static swig_type_info _swigt__p_wxFileType[] = {{"_p_wxFileType", 0, "wxFileType *", 0},{"_p_wxFileType"},{0}}; static swig_type_info _swigt__p_wxLogGui[] = {{"_p_wxLogGui", 0, "wxLogGui *", 0},{"_p_wxLogGui"},{0}}; static swig_type_info _swigt__p_wxFont[] = {{"_p_wxFont", 0, "wxFont *", 0},{"_p_wxFont"},{0}}; @@ -27674,15 +27952,16 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0},{"_p_wxLogTextCtrl"},{0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}}; static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0},{"_p_wxBusyCursor"},{0}}; -static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0},{"_p_wxPyTextDataObject"},{0}}; static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0},{"_p_wxBitmapDataObject"},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject},{0}}; static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0},{"_p_wxTextDataObject"},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject},{0}}; static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject},{"_p_wxDataObject"},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject},{0}}; +static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0},{"_p_wxPyBitmapDataObject"},{0}}; static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0},{"_p_wxFileDataObject"},{0}}; static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0},{"_p_wxCustomDataObject"},{0}}; static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0},{"_p_wxURLDataObject"},{0}}; static swig_type_info _swigt__p_wxMetafileDataObject[] = {{"_p_wxMetafileDataObject", 0, "wxMetafileDataObject *", 0},{"_p_wxMetafileDataObject"},{0}}; +static swig_type_info _swigt__p_wxSound[] = {{"_p_wxSound", 0, "wxSound *", 0},{"_p_wxSound"},{0}}; static swig_type_info _swigt__p_wxTimerRunner[] = {{"_p_wxTimerRunner", 0, "wxTimerRunner *", 0},{"_p_wxTimerRunner"},{0}}; static swig_type_info _swigt__p_wxLogWindow[] = {{"_p_wxLogWindow", 0, "wxLogWindow *", 0},{"_p_wxLogWindow"},{0}}; static swig_type_info _swigt__p_wxTimeSpan[] = {{"_p_wxTimeSpan", 0, "wxTimeSpan *", 0},{"_p_wxTimeSpan"},{0}}; @@ -27728,6 +28007,7 @@ static swig_type_info _swigt__p_wxProcessEvent[] = {{"_p_wxProcessEvent", 0, "wx static swig_type_info _swigt__p_wxPyLog[] = {{"_p_wxPyLog", 0, "wxPyLog *", 0},{"_p_wxPyLog"},{0}}; static swig_type_info _swigt__p_wxLogNull[] = {{"_p_wxLogNull", 0, "wxLogNull *", 0},{"_p_wxLogNull"},{0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0},{"_p_wxColour"},{0}}; +static swig_type_info _swigt__p_wxByte[] = {{"_p_wxByte", 0, "wxByte *", 0},{"_p_wxByte"},{0}}; static swig_type_info _swigt__p_wxConfigPathChanger[] = {{"_p_wxConfigPathChanger", 0, "wxConfigPathChanger *", 0},{"_p_wxConfigPathChanger"},{0}}; static swig_type_info _swigt__p_wxPyTimer[] = {{"_p_wxPyTimer", 0, "wxPyTimer *", 0},{"_p_wxPyTimer"},{0}}; static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan *", 0},{"_p_wxDateSpan"},{0}}; @@ -27742,7 +28022,6 @@ _swigt__p_wxDateTime__TimeZone, _swigt__p_wxMenu, _swigt__p_wxEvent, _swigt__p_wxConfigBase, -_swigt__p_wxWave, _swigt__p_wxFileType, _swigt__p_wxLogGui, _swigt__p_wxFont, @@ -27760,15 +28039,16 @@ _swigt__p_wxLogStderr, _swigt__p_wxLogTextCtrl, _swigt__p_wxTextCtrl, _swigt__p_wxBusyCursor, -_swigt__p_wxPyBitmapDataObject, _swigt__p_wxPyTextDataObject, _swigt__p_wxBitmapDataObject, _swigt__p_wxTextDataObject, _swigt__p_wxDataObject, +_swigt__p_wxPyBitmapDataObject, _swigt__p_wxFileDataObject, _swigt__p_wxCustomDataObject, _swigt__p_wxURLDataObject, _swigt__p_wxMetafileDataObject, +_swigt__p_wxSound, _swigt__p_wxTimerRunner, _swigt__p_wxLogWindow, _swigt__p_wxTimeSpan, @@ -27814,6 +28094,7 @@ _swigt__p_wxProcessEvent, _swigt__p_wxPyLog, _swigt__p_wxLogNull, _swigt__p_wxColour, +_swigt__p_wxByte, _swigt__p_wxConfigPathChanger, _swigt__p_wxPyTimer, _swigt__p_wxDateSpan, @@ -28014,6 +28295,9 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP)); PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE)); PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE)); + PyDict_SetItemString(d,"SOUND_SYNC", SWIG_PyObj_FromInt((int)wxSOUND_SYNC)); + PyDict_SetItemString(d,"SOUND_ASYNC", SWIG_PyObj_FromInt((int)wxSOUND_ASYNC)); + PyDict_SetItemString(d,"SOUND_LOOP", SWIG_PyObj_FromInt((int)wxSOUND_LOOP)); PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_PyObj_FromInt((int)wxMAILCAP_STANDARD)); PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_PyObj_FromInt((int)wxMAILCAP_NETSCAPE)); PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_PyObj_FromInt((int)wxMAILCAP_KDE)); diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py index 8d229b3f54..05133e33bb 100644 --- a/wxPython/src/mac/windows.py +++ b/wxPython/src/mac/windows.py @@ -1821,8 +1821,8 @@ class MultiChoiceDialog(Dialog): return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, String message, String caption, int LCOUNT, - String choices, long style=CHOICEDLG_STYLE, + __init__(Window parent, String message, String caption, int choices=0, + String choices_array, long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> MultiChoiceDialog """ newobj = _windows.new_MultiChoiceDialog(*args, **kwargs) diff --git a/wxPython/src/mac/windows_wrap.cpp b/wxPython/src/mac/windows_wrap.cpp index ba0d60c754..eae2267306 100644 --- a/wxPython/src/mac/windows_wrap.cpp +++ b/wxPython/src/mac/windows_wrap.cpp @@ -387,15 +387,6 @@ SWIG_PyObj_AsLong(PyObject * obj) } -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - - SWIGSTATIC(bool) SWIG_PyObj_AsBool(PyObject *obj) { @@ -1250,7 +1241,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -1466,7 +1457,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -2556,7 +2547,7 @@ static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2581,7 +2572,7 @@ static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2709,7 +2700,7 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2734,7 +2725,7 @@ static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2836,7 +2827,7 @@ static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3044,7 +3035,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -3198,7 +3189,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -3938,7 +3929,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4110,7 +4101,7 @@ static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4190,7 +4181,7 @@ static PyObject *_wrap_Dialog_IsModalShowing(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -4394,7 +4385,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -4845,7 +4836,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp5) delete arg5; @@ -5430,7 +5421,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -5613,7 +5604,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5652,7 +5643,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5682,7 +5673,7 @@ static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5713,7 +5704,7 @@ static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -5738,7 +5729,7 @@ static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6011,7 +6002,7 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6090,7 +6081,7 @@ static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6484,7 +6475,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -6559,7 +6550,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -6626,7 +6617,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -7920,7 +7911,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -8155,7 +8146,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8188,7 +8179,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8221,7 +8212,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8675,7 +8666,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -8744,7 +8735,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8775,7 +8766,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -8806,7 +8797,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9071,7 +9062,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9305,7 +9296,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -9363,7 +9354,7 @@ static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9419,7 +9410,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9450,7 +9441,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9717,7 +9708,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9754,7 +9745,7 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9809,7 +9800,7 @@ static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -9834,7 +9825,7 @@ static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -10146,7 +10137,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp7) delete arg7; @@ -10497,7 +10488,7 @@ static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -11718,7 +11709,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO wxWindow *arg1 = (wxWindow *) 0 ; wxString *arg2 = 0 ; wxString *arg3 = 0 ; - int arg4 ; + int arg4 = (int) 0 ; wxString *arg5 = (wxString *) 0 ; long arg6 = (long) wxCHOICEDLG_STYLE ; wxPoint const &arg7_defvalue = wxDefaultPosition ; @@ -11726,20 +11717,18 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO wxMultiChoiceDialog *result; bool temp2 = False ; bool temp3 = False ; - bool temp5 = False ; - wxPoint temp7 ; + wxPoint temp6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; - PyObject * obj6 = 0 ; char *kwnames[] = { - (char *) "parent",(char *) "message",(char *) "caption",(char *) "LCOUNT",(char *) "choices",(char *) "style",(char *) "pos", NULL + (char *) "parent",(char *) "message",(char *) "caption",(char *) "choices",(char *) "style",(char *) "pos", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:new_MultiChoiceDialog",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -11751,25 +11740,23 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO if (arg3 == NULL) SWIG_fail; temp3 = True; } - { - arg4 = (int) SWIG_PyObj_AsInt(obj3); - if (PyErr_Occurred()) SWIG_fail; - } - { - arg5 = wxString_in_helper(obj4); - if (arg5 == NULL) SWIG_fail; - temp5 = True; + if (obj3) { + { + arg4 = PyList_Size(obj3); + arg5 = wxString_LIST_helper(obj3); + if (arg5 == NULL) SWIG_fail; + } } - if (obj5) { + if (obj4) { { - arg6 = (long) SWIG_PyObj_AsLong(obj5); + arg6 = (long) SWIG_PyObj_AsLong(obj4); if (PyErr_Occurred()) SWIG_fail; } } - if (obj6) { + if (obj5) { { - arg7 = &temp7; - if ( ! wxPoint_helper(obj6, &arg7)) SWIG_fail; + arg7 = &temp6; + if ( ! wxPoint_helper(obj5, &arg7)) SWIG_fail; } } { @@ -11789,8 +11776,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO delete arg3; } { - if (temp5) - delete arg5; + if (arg5) delete [] arg5; } return resultobj; fail: @@ -11803,8 +11789,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO delete arg3; } { - if (temp5) - delete arg5; + if (arg5) delete [] arg5; } return NULL; } @@ -12390,7 +12375,7 @@ static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12473,7 +12458,7 @@ static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -12527,7 +12512,7 @@ static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -13039,7 +13024,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp3) delete arg3; @@ -13736,7 +13721,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -14000,7 +13985,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -14425,7 +14410,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -14621,7 +14606,7 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15133,7 +15118,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15158,7 +15143,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15183,7 +15168,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15208,7 +15193,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15233,7 +15218,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15828,7 +15813,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15853,7 +15838,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15878,7 +15863,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15903,7 +15888,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -15928,7 +15913,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16154,7 +16139,7 @@ static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16204,7 +16189,7 @@ static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kw wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -16263,7 +16248,7 @@ static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17592,7 +17577,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17617,7 +17602,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17642,7 +17627,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17667,7 +17652,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17692,7 +17677,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17717,7 +17702,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17742,7 +17727,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -17965,7 +17950,7 @@ static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18533,7 +18518,7 @@ static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18558,7 +18543,7 @@ static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *ar wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18583,7 +18568,7 @@ static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18608,7 +18593,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -18633,7 +18618,7 @@ static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19078,7 +19063,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19103,7 +19088,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19128,7 +19113,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyOb wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19153,7 +19138,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19178,7 +19163,7 @@ static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19508,7 +19493,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19612,7 +19597,7 @@ static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -19637,7 +19622,7 @@ static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20145,7 +20130,7 @@ static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20212,7 +20197,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -20339,7 +20324,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21027,7 +21012,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21273,7 +21258,7 @@ static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21307,7 +21292,7 @@ static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21338,7 +21323,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21523,7 +21508,7 @@ static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21584,7 +21569,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21709,7 +21694,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21743,7 +21728,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *a wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21777,7 +21762,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21808,7 +21793,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -21869,7 +21854,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp index 541b775685..46a62e294c 100644 --- a/wxPython/src/mac/wizard_wrap.cpp +++ b/wxPython/src/mac/wizard_wrap.cpp @@ -323,15 +323,6 @@ SWIG_PyObj_AsBool(PyObject *obj) return PyObject_IsTrue(obj) ? true : false; } - -SWIGSTATIC(PyObject*) -SWIG_PyObj_FromBool(bool value) -{ - PyObject *obj = value ? Py_True : Py_False; - Py_INCREF(obj); - return obj; -} - bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){ wxChar* res = NULL; if (resource.Length()) @@ -529,7 +520,7 @@ static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -611,7 +602,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -827,7 +818,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1262,7 +1253,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, Py wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1287,7 +1278,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self, wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1312,7 +1303,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1337,7 +1328,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject * wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1362,7 +1353,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1577,7 +1568,7 @@ static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, P wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -1832,7 +1823,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); { if (temp4) delete arg4; @@ -1892,7 +1883,7 @@ static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2088,7 +2079,7 @@ static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2124,7 +2115,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2152,7 +2143,7 @@ static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; @@ -2180,7 +2171,7 @@ static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObje wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromBool((bool)result); + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); return resultobj; fail: return NULL; -- 2.45.2