X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a69276900cfae8bf48b5ba5af6811fb89675ba33..395e0a70bad49a83c9c8eb7626b1e3dd2e5f10c5:/wxPython/src/mac/aui_wrap.cpp?ds=sidebyside diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index db896c260d..b5c18865cf 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -2552,152 +2552,151 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxChildFocusEvent swig_types[86] #define SWIGTYPE_p_wxClipboardTextEvent swig_types[87] #define SWIGTYPE_p_wxCloseEvent swig_types[88] -#define SWIGTYPE_p_wxColor swig_types[89] -#define SWIGTYPE_p_wxColour swig_types[90] -#define SWIGTYPE_p_wxColourData swig_types[91] -#define SWIGTYPE_p_wxColourDialog swig_types[92] -#define SWIGTYPE_p_wxCommandEvent swig_types[93] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[94] -#define SWIGTYPE_p_wxControl swig_types[95] -#define SWIGTYPE_p_wxControlWithItems swig_types[96] -#define SWIGTYPE_p_wxDC swig_types[97] -#define SWIGTYPE_p_wxDateEvent swig_types[98] -#define SWIGTYPE_p_wxDialog swig_types[99] -#define SWIGTYPE_p_wxDirDialog swig_types[100] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[101] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[102] -#define SWIGTYPE_p_wxDuplexMode swig_types[103] -#define SWIGTYPE_p_wxEraseEvent swig_types[104] -#define SWIGTYPE_p_wxEvent swig_types[105] -#define SWIGTYPE_p_wxEvtHandler swig_types[106] -#define SWIGTYPE_p_wxFSFile swig_types[107] -#define SWIGTYPE_p_wxFileDialog swig_types[108] -#define SWIGTYPE_p_wxFileSystem swig_types[109] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[110] -#define SWIGTYPE_p_wxFindReplaceData swig_types[111] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[112] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[113] -#define SWIGTYPE_p_wxFocusEvent swig_types[114] -#define SWIGTYPE_p_wxFont swig_types[115] -#define SWIGTYPE_p_wxFontData swig_types[116] -#define SWIGTYPE_p_wxFontDialog swig_types[117] -#define SWIGTYPE_p_wxFrame swig_types[118] -#define SWIGTYPE_p_wxGBSizerItem swig_types[119] -#define SWIGTYPE_p_wxGIFHandler swig_types[120] -#define SWIGTYPE_p_wxGridBagSizer swig_types[121] -#define SWIGTYPE_p_wxGridSizer swig_types[122] -#define SWIGTYPE_p_wxICOHandler swig_types[123] -#define SWIGTYPE_p_wxIconizeEvent swig_types[124] -#define SWIGTYPE_p_wxIdleEvent swig_types[125] -#define SWIGTYPE_p_wxImage swig_types[126] -#define SWIGTYPE_p_wxImageHandler swig_types[127] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[128] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[129] -#define SWIGTYPE_p_wxJPEGHandler swig_types[130] -#define SWIGTYPE_p_wxKeyEvent swig_types[131] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[132] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[133] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[134] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[135] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[136] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[137] -#define SWIGTYPE_p_wxMenu swig_types[138] -#define SWIGTYPE_p_wxMenuBar swig_types[139] -#define SWIGTYPE_p_wxMenuEvent swig_types[140] -#define SWIGTYPE_p_wxMenuItem swig_types[141] -#define SWIGTYPE_p_wxMessageDialog swig_types[142] -#define SWIGTYPE_p_wxMiniFrame swig_types[143] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[144] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[145] -#define SWIGTYPE_p_wxMouseEvent swig_types[146] -#define SWIGTYPE_p_wxMoveEvent swig_types[147] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[148] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[149] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[150] -#define SWIGTYPE_p_wxNotifyEvent swig_types[151] -#define SWIGTYPE_p_wxNumberEntryDialog swig_types[152] -#define SWIGTYPE_p_wxObject swig_types[153] -#define SWIGTYPE_p_wxPCXHandler swig_types[154] -#define SWIGTYPE_p_wxPNGHandler swig_types[155] -#define SWIGTYPE_p_wxPNMHandler swig_types[156] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[157] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[158] -#define SWIGTYPE_p_wxPaintEvent swig_types[159] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[160] -#define SWIGTYPE_p_wxPanel swig_types[161] -#define SWIGTYPE_p_wxPaperSize swig_types[162] -#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[163] -#define SWIGTYPE_p_wxPoint swig_types[164] -#define SWIGTYPE_p_wxPopupWindow swig_types[165] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[166] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[167] -#define SWIGTYPE_p_wxPreviewFrame swig_types[168] -#define SWIGTYPE_p_wxPrintData swig_types[169] -#define SWIGTYPE_p_wxPrintDialog swig_types[170] -#define SWIGTYPE_p_wxPrintDialogData swig_types[171] -#define SWIGTYPE_p_wxPrintPreview swig_types[172] -#define SWIGTYPE_p_wxPrinter swig_types[173] -#define SWIGTYPE_p_wxProgressDialog swig_types[174] -#define SWIGTYPE_p_wxPyApp swig_types[175] -#define SWIGTYPE_p_wxPyAuiDockArt swig_types[176] -#define SWIGTYPE_p_wxPyAuiTabArt swig_types[177] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[178] -#define SWIGTYPE_p_wxPyEvent swig_types[179] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[180] -#define SWIGTYPE_p_wxPyImageHandler swig_types[181] -#define SWIGTYPE_p_wxPyPanel swig_types[182] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[183] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[184] -#define SWIGTYPE_p_wxPyPreviewFrame swig_types[185] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[186] -#define SWIGTYPE_p_wxPyPrintout swig_types[187] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[188] -#define SWIGTYPE_p_wxPySizer swig_types[189] -#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[190] -#define SWIGTYPE_p_wxPyVListBox swig_types[191] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[192] -#define SWIGTYPE_p_wxPyValidator swig_types[193] -#define SWIGTYPE_p_wxPyWindow swig_types[194] -#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[195] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[196] -#define SWIGTYPE_p_wxRect swig_types[197] -#define SWIGTYPE_p_wxSashEvent swig_types[198] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[199] -#define SWIGTYPE_p_wxSashWindow swig_types[200] -#define SWIGTYPE_p_wxScrollEvent swig_types[201] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[202] -#define SWIGTYPE_p_wxScrolledWindow swig_types[203] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[204] -#define SWIGTYPE_p_wxShowEvent swig_types[205] -#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[206] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[207] -#define SWIGTYPE_p_wxSize swig_types[208] -#define SWIGTYPE_p_wxSizeEvent swig_types[209] -#define SWIGTYPE_p_wxSizer swig_types[210] -#define SWIGTYPE_p_wxSizerItem swig_types[211] -#define SWIGTYPE_p_wxSplashScreen swig_types[212] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[213] -#define SWIGTYPE_p_wxSplitterEvent swig_types[214] -#define SWIGTYPE_p_wxSplitterWindow swig_types[215] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[216] -#define SWIGTYPE_p_wxStatusBar swig_types[217] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[218] -#define SWIGTYPE_p_wxString swig_types[219] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[220] -#define SWIGTYPE_p_wxTGAHandler swig_types[221] -#define SWIGTYPE_p_wxTIFFHandler swig_types[222] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[223] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[224] -#define SWIGTYPE_p_wxTipWindow swig_types[225] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[226] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[227] -#define SWIGTYPE_p_wxValidator swig_types[228] -#define SWIGTYPE_p_wxWindow swig_types[229] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[230] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[231] -#define SWIGTYPE_p_wxXPMHandler swig_types[232] -static swig_type_info *swig_types[234]; -static swig_module_info swig_module = {swig_types, 233, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxColour swig_types[89] +#define SWIGTYPE_p_wxColourData swig_types[90] +#define SWIGTYPE_p_wxColourDialog swig_types[91] +#define SWIGTYPE_p_wxCommandEvent swig_types[92] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[93] +#define SWIGTYPE_p_wxControl swig_types[94] +#define SWIGTYPE_p_wxControlWithItems swig_types[95] +#define SWIGTYPE_p_wxDC swig_types[96] +#define SWIGTYPE_p_wxDateEvent swig_types[97] +#define SWIGTYPE_p_wxDialog swig_types[98] +#define SWIGTYPE_p_wxDirDialog swig_types[99] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[100] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[101] +#define SWIGTYPE_p_wxDuplexMode swig_types[102] +#define SWIGTYPE_p_wxEraseEvent swig_types[103] +#define SWIGTYPE_p_wxEvent swig_types[104] +#define SWIGTYPE_p_wxEvtHandler swig_types[105] +#define SWIGTYPE_p_wxFSFile swig_types[106] +#define SWIGTYPE_p_wxFileDialog swig_types[107] +#define SWIGTYPE_p_wxFileSystem swig_types[108] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[109] +#define SWIGTYPE_p_wxFindReplaceData swig_types[110] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[111] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[112] +#define SWIGTYPE_p_wxFocusEvent swig_types[113] +#define SWIGTYPE_p_wxFont swig_types[114] +#define SWIGTYPE_p_wxFontData swig_types[115] +#define SWIGTYPE_p_wxFontDialog swig_types[116] +#define SWIGTYPE_p_wxFrame swig_types[117] +#define SWIGTYPE_p_wxGBSizerItem swig_types[118] +#define SWIGTYPE_p_wxGIFHandler swig_types[119] +#define SWIGTYPE_p_wxGridBagSizer swig_types[120] +#define SWIGTYPE_p_wxGridSizer swig_types[121] +#define SWIGTYPE_p_wxICOHandler swig_types[122] +#define SWIGTYPE_p_wxIconizeEvent swig_types[123] +#define SWIGTYPE_p_wxIdleEvent swig_types[124] +#define SWIGTYPE_p_wxImage swig_types[125] +#define SWIGTYPE_p_wxImageHandler swig_types[126] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[127] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[128] +#define SWIGTYPE_p_wxJPEGHandler swig_types[129] +#define SWIGTYPE_p_wxKeyEvent swig_types[130] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[131] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[132] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[133] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[134] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[135] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[136] +#define SWIGTYPE_p_wxMenu swig_types[137] +#define SWIGTYPE_p_wxMenuBar swig_types[138] +#define SWIGTYPE_p_wxMenuEvent swig_types[139] +#define SWIGTYPE_p_wxMenuItem swig_types[140] +#define SWIGTYPE_p_wxMessageDialog swig_types[141] +#define SWIGTYPE_p_wxMiniFrame swig_types[142] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[143] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[144] +#define SWIGTYPE_p_wxMouseEvent swig_types[145] +#define SWIGTYPE_p_wxMoveEvent swig_types[146] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[147] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[148] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[149] +#define SWIGTYPE_p_wxNotifyEvent swig_types[150] +#define SWIGTYPE_p_wxNumberEntryDialog swig_types[151] +#define SWIGTYPE_p_wxObject swig_types[152] +#define SWIGTYPE_p_wxPCXHandler swig_types[153] +#define SWIGTYPE_p_wxPNGHandler swig_types[154] +#define SWIGTYPE_p_wxPNMHandler swig_types[155] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[156] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[157] +#define SWIGTYPE_p_wxPaintEvent swig_types[158] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[159] +#define SWIGTYPE_p_wxPanel swig_types[160] +#define SWIGTYPE_p_wxPaperSize swig_types[161] +#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[162] +#define SWIGTYPE_p_wxPoint swig_types[163] +#define SWIGTYPE_p_wxPopupWindow swig_types[164] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[165] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[166] +#define SWIGTYPE_p_wxPreviewFrame swig_types[167] +#define SWIGTYPE_p_wxPrintData swig_types[168] +#define SWIGTYPE_p_wxPrintDialog swig_types[169] +#define SWIGTYPE_p_wxPrintDialogData swig_types[170] +#define SWIGTYPE_p_wxPrintPreview swig_types[171] +#define SWIGTYPE_p_wxPrinter swig_types[172] +#define SWIGTYPE_p_wxProgressDialog swig_types[173] +#define SWIGTYPE_p_wxPyApp swig_types[174] +#define SWIGTYPE_p_wxPyAuiDockArt swig_types[175] +#define SWIGTYPE_p_wxPyAuiTabArt swig_types[176] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[177] +#define SWIGTYPE_p_wxPyEvent swig_types[178] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[179] +#define SWIGTYPE_p_wxPyImageHandler swig_types[180] +#define SWIGTYPE_p_wxPyPanel swig_types[181] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[182] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[183] +#define SWIGTYPE_p_wxPyPreviewFrame swig_types[184] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[185] +#define SWIGTYPE_p_wxPyPrintout swig_types[186] +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[187] +#define SWIGTYPE_p_wxPySizer swig_types[188] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[189] +#define SWIGTYPE_p_wxPyVListBox swig_types[190] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[191] +#define SWIGTYPE_p_wxPyValidator swig_types[192] +#define SWIGTYPE_p_wxPyWindow swig_types[193] +#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[194] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[195] +#define SWIGTYPE_p_wxRect swig_types[196] +#define SWIGTYPE_p_wxSashEvent swig_types[197] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[198] +#define SWIGTYPE_p_wxSashWindow swig_types[199] +#define SWIGTYPE_p_wxScrollEvent swig_types[200] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[201] +#define SWIGTYPE_p_wxScrolledWindow swig_types[202] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[203] +#define SWIGTYPE_p_wxShowEvent swig_types[204] +#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[205] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[206] +#define SWIGTYPE_p_wxSize swig_types[207] +#define SWIGTYPE_p_wxSizeEvent swig_types[208] +#define SWIGTYPE_p_wxSizer swig_types[209] +#define SWIGTYPE_p_wxSizerItem swig_types[210] +#define SWIGTYPE_p_wxSplashScreen swig_types[211] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[212] +#define SWIGTYPE_p_wxSplitterEvent swig_types[213] +#define SWIGTYPE_p_wxSplitterWindow swig_types[214] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[215] +#define SWIGTYPE_p_wxStatusBar swig_types[216] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[217] +#define SWIGTYPE_p_wxString swig_types[218] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[219] +#define SWIGTYPE_p_wxTGAHandler swig_types[220] +#define SWIGTYPE_p_wxTIFFHandler swig_types[221] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[222] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[223] +#define SWIGTYPE_p_wxTipWindow swig_types[224] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[225] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[226] +#define SWIGTYPE_p_wxValidator swig_types[227] +#define SWIGTYPE_p_wxWindow swig_types[228] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[229] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[230] +#define SWIGTYPE_p_wxXPMHandler swig_types[231] +static swig_type_info *swig_types[233]; +static swig_module_info swig_module = {swig_types, 232, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -10966,13 +10965,12 @@ SWIGINTERN PyObject *_wrap_AuiDockArt_SetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *resultobj = 0; wxAuiDockArt *arg1 = (wxAuiDockArt *) 0 ; int arg2 ; - wxColor *arg3 = 0 ; + wxColour *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; int val2 ; int ecode2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + wxColour temp3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -10991,17 +10989,13 @@ SWIGINTERN PyObject *_wrap_AuiDockArt_SetColour(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiDockArt_SetColour" "', expected argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); - res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxColor, 0 | 0); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiDockArt_SetColour" "', expected argument " "3"" of type '" "wxColor const &""'"); - } - if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiDockArt_SetColour" "', expected argument " "3"" of type '" "wxColor const &""'"); + { + arg3 = &temp3; + if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail; } - arg3 = reinterpret_cast< wxColor * >(argp3); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetColour(arg2,(wxColor const &)*arg3); + (arg1)->SetColour(arg2,(wxColour const &)*arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -14435,7 +14429,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPage__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; size_t arg2 ; @@ -14444,14 +14438,19 @@ SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPage__SWIG_0(PyObject *SWIGUNUSEDP int res1 = 0 ; size_t val2 ; int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "idx", NULL + }; - if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_GetPage",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_GetPage" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); } arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); + ecode2 = SWIG_AsVal_size_t(obj1, &val2); if (!SWIG_IsOK(ecode2)) { SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_GetPage" "', expected argument " "2"" of type '" "size_t""'"); } @@ -14472,62 +14471,6 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPage__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { - PyObject *resultobj = 0; - wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; - size_t arg2 ; - wxAuiNotebookPage *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - size_t val2 ; - int ecode2 = 0 ; - - if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiTabContainer, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabContainer_GetPage" "', expected argument " "1"" of type '" "wxAuiTabContainer const *""'"); - } - arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1); - ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2); - if (!SWIG_IsOK(ecode2)) { - SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_GetPage" "', expected argument " "2"" of type '" "size_t""'"); - } - arg2 = static_cast< size_t >(val2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxAuiNotebookPage const &_result_ref = ((wxAuiTabContainer const *)arg1)->GetPage(arg2); - result = (wxAuiNotebookPage *) &_result_ref; - } - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebookPage, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPage(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[3]; - - if (!(argc = SWIG_Python_UnpackTuple(args,"AuiTabContainer_GetPage",0,2,argv))) SWIG_fail; - --argc; - if (argc == 2) { - return _wrap_AuiTabContainer_GetPage__SWIG_0(self, argc, argv); - } - if (argc == 2) { - return _wrap_AuiTabContainer_GetPage__SWIG_1(self, argc, argv); - } - -fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'AuiTabContainer_GetPage'"); - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiTabContainer_GetPages(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; @@ -16421,7 +16364,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabContainer_GetWindowFromIdx", (PyCFunction) _wrap_AuiTabContainer_GetWindowFromIdx, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetIdxFromWindow", (PyCFunction) _wrap_AuiTabContainer_GetIdxFromWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetPageCount", (PyCFunction)_wrap_AuiTabContainer_GetPageCount, METH_O, NULL}, - { (char *)"AuiTabContainer_GetPage", _wrap_AuiTabContainer_GetPage, METH_VARARGS, NULL}, + { (char *)"AuiTabContainer_GetPage", (PyCFunction) _wrap_AuiTabContainer_GetPage, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetPages", (PyCFunction)_wrap_AuiTabContainer_GetPages, METH_O, NULL}, { (char *)"AuiTabContainer_SetNormalFont", (PyCFunction) _wrap_AuiTabContainer_SetNormalFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_SetSelectedFont", (PyCFunction) _wrap_AuiTabContainer_SetSelectedFont, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -17782,7 +17725,6 @@ static swig_type_info _swigt__p_wxAuiTabContainer = {"_p_wxAuiTabContainer", "wx static swig_type_info _swigt__p_wxAuiTabContainerButton = {"_p_wxAuiTabContainerButton", "wxAuiTabContainerButton *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiTabCtrl = {"_p_wxAuiTabCtrl", "wxAuiTabCtrl *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_wxColor = {"_p_wxColor", "wxColor *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxCommandEvent = {"_p_wxCommandEvent", "wxCommandEvent *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxSashEvent = {"_p_wxSashEvent", 0, 0, 0, 0, 0}; @@ -18027,7 +17969,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxChildFocusEvent, &_swigt__p_wxClipboardTextEvent, &_swigt__p_wxCloseEvent, - &_swigt__p_wxColor, &_swigt__p_wxColour, &_swigt__p_wxColourData, &_swigt__p_wxColourDialog, @@ -18252,7 +18193,6 @@ static swig_cast_info _swigc__p_wxAuiTabContainer[] = { {&_swigt__p_wxAuiTabCon static swig_cast_info _swigc__p_wxAuiTabContainerButton[] = { {&_swigt__p_wxAuiTabContainerButton, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiTabCtrl[] = { {&_swigt__p_wxAuiTabCtrl, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxColor[] = { {&_swigt__p_wxColor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSashEvent[] = {{&_swigt__p_wxSashEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowDestroyEvent[] = {{&_swigt__p_wxWindowDestroyEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -18497,7 +18437,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxChildFocusEvent, _swigc__p_wxClipboardTextEvent, _swigc__p_wxCloseEvent, - _swigc__p_wxColor, _swigc__p_wxColour, _swigc__p_wxColourData, _swigc__p_wxColourDialog,