From: Robin Dunn Date: Thu, 2 Nov 2006 17:05:17 +0000 (+0000) Subject: AUI updates. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/36cb9ebe32844a43faf0a1aceef55bdc6a6367e8 AUI updates. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index 254ed49fe5..a501813b40 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -511,12 +511,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const wxRect& in_rect, const wxString& caption, bool active, - bool with_close_button, - wxRect* out_rect, + int close_button_state, + wxRect* out_tab_rect, + wxRect* out_button_rect, int* x_extent) { bool found; - const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)"; + const char* errmsg = "DrawTab should return a sequence containing (tab_rect, button_rect, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); @@ -526,20 +527,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( "(OOOii)", odc, orect, otext, - (int)active, (int)with_close_button)); + (int)active, close_button_state)); if (ro) { - if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { + if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { PyObject* o1 = PySequence_GetItem(ro, 0); PyObject* o2 = PySequence_GetItem(ro, 1); - if (!wxRect_helper(o1, &out_rect)) + PyObject* o3 = PySequence_GetItem(ro, 2); + if (!wxRect_helper(o1, &out_tab_rect)) PyErr_SetString(PyExc_TypeError, errmsg); - else if (!PyInt_Check(o2)) + else if (!wxRect_helper(o2, &out_button_rect)) + PyErr_SetString(PyExc_TypeError, errmsg); + else if (!PyInt_Check(o3)) PyErr_SetString(PyExc_TypeError, errmsg); else - *x_extent = PyInt_AsLong(o2); + *x_extent = PyInt_AsLong(o3); Py_DECREF(o1); Py_DECREF(o2); + Py_DECREF(o3); } else { PyErr_SetString(PyExc_TypeError, errmsg); @@ -553,7 +558,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, with_close_button, out_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } @@ -595,7 +600,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual wxSize GetTabSize( wxDC* dc, const wxString& caption, bool active, - bool with_close_button, + int close_button_state, int* x_extent) { bool found; @@ -607,7 +612,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, (int)with_close_button)); + "(OOi)", odc, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -633,7 +638,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, with_close_button, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); return rv; } diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 156d54c61d..7e489cc7f6 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -991,8 +991,8 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS AUI_NB_DEFAULT_STYLE = _aui.AUI_NB_DEFAULT_STYLE @@ -1021,8 +1021,9 @@ class AuiTabArt(object): def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, bool with_close_button, - Rect out_rect, int x_extent) + DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, + Rect out_tab_rect, Rect out_button_rect, + int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) @@ -1035,7 +1036,7 @@ class AuiTabArt(object): def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, bool with_close_button, + GetTabSize(self, DC dc, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) @@ -1220,6 +1221,10 @@ class AuiTabContainer(object): """SetRect(self, Rect rect)""" return _aui.AuiTabContainer_SetRect(*args, **kwargs) + def RemoveButton(*args, **kwargs): + """RemoveButton(self, int id)""" + return _aui.AuiTabContainer_RemoveButton(*args, **kwargs) + def AddButton(*args, **kwargs): """ AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 27cdb7c2b2..ec224a2724 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -3099,12 +3099,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const wxRect& in_rect, const wxString& caption, bool active, - bool with_close_button, - wxRect* out_rect, + int close_button_state, + wxRect* out_tab_rect, + wxRect* out_button_rect, int* x_extent) { bool found; - const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)"; + const char* errmsg = "DrawTab should return a sequence containing (tab_rect, button_rect, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); @@ -3114,20 +3115,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( "(OOOii)", odc, orect, otext, - (int)active, (int)with_close_button)); + (int)active, close_button_state)); if (ro) { - if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { + if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { PyObject* o1 = PySequence_GetItem(ro, 0); PyObject* o2 = PySequence_GetItem(ro, 1); - if (!wxRect_helper(o1, &out_rect)) + PyObject* o3 = PySequence_GetItem(ro, 2); + if (!wxRect_helper(o1, &out_tab_rect)) PyErr_SetString(PyExc_TypeError, errmsg); - else if (!PyInt_Check(o2)) + else if (!wxRect_helper(o2, &out_button_rect)) + PyErr_SetString(PyExc_TypeError, errmsg); + else if (!PyInt_Check(o3)) PyErr_SetString(PyExc_TypeError, errmsg); else - *x_extent = PyInt_AsLong(o2); + *x_extent = PyInt_AsLong(o3); Py_DECREF(o1); Py_DECREF(o2); + Py_DECREF(o3); } else { PyErr_SetString(PyExc_TypeError, errmsg); @@ -3141,7 +3146,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, with_close_button, out_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } @@ -3183,7 +3188,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual wxSize GetTabSize( wxDC* dc, const wxString& caption, bool active, - bool with_close_button, + int close_button_state, int* x_extent) { bool found; @@ -3195,7 +3200,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, (int)with_close_button)); + "(OOi)", odc, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3221,7 +3226,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, with_close_button, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); return rv; } @@ -11553,9 +11558,10 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO wxRect *arg3 = 0 ; wxString *arg4 = 0 ; bool arg5 ; - bool arg6 ; + int arg6 ; wxRect *arg7 = (wxRect *) 0 ; - int *arg8 = (int *) 0 ; + wxRect *arg8 = (wxRect *) 0 ; + int *arg9 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -11564,12 +11570,14 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO bool temp4 = false ; bool val5 ; int ecode5 = 0 ; - bool val6 ; + int val6 ; int ecode6 = 0 ; void *argp7 = 0 ; int res7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11578,11 +11586,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "out_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11607,24 +11616,29 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); } arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_bool(obj5, &val6); + ecode6 = SWIG_AsVal_int(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); } - arg6 = static_cast< bool >(val6); + arg6 = static_cast< int >(val6); res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res7)) { SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); } arg7 = reinterpret_cast< wxRect * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_int, 0 | 0 ); + res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); } - arg8 = reinterpret_cast< int * >(argp8); + arg8 = reinterpret_cast< wxRect * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); + } + arg9 = reinterpret_cast< int * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8); + (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11742,7 +11756,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), wxDC *arg2 = (wxDC *) 0 ; wxString *arg3 = 0 ; bool arg4 ; - bool arg5 ; + int arg5 ; int *arg6 = (int *) 0 ; wxSize result; void *argp1 = 0 ; @@ -11752,7 +11766,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), bool temp3 = false ; bool val4 ; int ecode4 = 0 ; - bool val5 ; + int val5 ; int ecode5 = 0 ; void *argp6 = 0 ; int res6 = 0 ; @@ -11763,7 +11777,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; @@ -11787,11 +11801,11 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); } arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_bool(obj4, &val5); + ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); } - arg5 = static_cast< bool >(val5); + arg5 = static_cast< int >(val5); res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); if (!SWIG_IsOK(res6)) { SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); @@ -13851,6 +13865,44 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabContainer_RemoveButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "id", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_RemoveButton",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_RemoveButton" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); + } + arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_RemoveButton" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveButton(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; @@ -15176,6 +15228,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabContainer_SetMeasuringFont", (PyCFunction) _wrap_AuiTabContainer_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL}, { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabContainer_RemoveButton", (PyCFunction) _wrap_AuiTabContainer_RemoveButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL}, { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -17954,8 +18007,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); SWIG_Python_SetConstant(d, "AUI_NB_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxAUI_NB_DEFAULT_STYLE))); diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 192eea0b69..7e489cc7f6 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -611,12 +611,13 @@ class AuiManager(_core.EvtHandler): """GetAllPanes(self) -> wxAuiPaneInfoArray""" return _aui.AuiManager_GetAllPanes(*args, **kwargs) - def AddPane(*args): - """ - AddPane(self, Window window, AuiPaneInfo pane_info) -> bool - AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool - """ - return _aui.AuiManager_AddPane(*args) + def _AddPane1(*args, **kwargs): + """_AddPane1(self, Window window, AuiPaneInfo pane_info) -> bool""" + return _aui.AuiManager__AddPane1(*args, **kwargs) + + def AddPane(*args, **kwargs): + """AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool""" + return _aui.AuiManager_AddPane(*args, **kwargs) def _AddPane2(*args, **kwargs): """_AddPane2(self, Window window, int direction=LEFT, String caption=wxEmptyString) -> bool""" @@ -726,7 +727,7 @@ class AuiManager(_core.EvtHandler): pane info, and defaults to ``wx.LEFT``. The pane caption may also be specified as an extra parameter in this form. """ - if type(info) == PaneInfo: + if type(info) == AuiPaneInfo: return self._AddPane1(window, info) else: @@ -990,8 +991,8 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS AUI_NB_DEFAULT_STYLE = _aui.AUI_NB_DEFAULT_STYLE @@ -1020,8 +1021,9 @@ class AuiTabArt(object): def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, bool with_close_button, - Rect out_rect, int x_extent) + DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, + Rect out_tab_rect, Rect out_button_rect, + int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) @@ -1034,7 +1036,7 @@ class AuiTabArt(object): def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, bool with_close_button, + GetTabSize(self, DC dc, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) @@ -1219,6 +1221,10 @@ class AuiTabContainer(object): """SetRect(self, Rect rect)""" return _aui.AuiTabContainer_SetRect(*args, **kwargs) + def RemoveButton(*args, **kwargs): + """RemoveButton(self, int id)""" + return _aui.AuiTabContainer_RemoveButton(*args, **kwargs) + def AddButton(*args, **kwargs): """ AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index 4689997167..6465682801 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -3099,12 +3099,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const wxRect& in_rect, const wxString& caption, bool active, - bool with_close_button, - wxRect* out_rect, + int close_button_state, + wxRect* out_tab_rect, + wxRect* out_button_rect, int* x_extent) { bool found; - const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)"; + const char* errmsg = "DrawTab should return a sequence containing (tab_rect, button_rect, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); @@ -3114,20 +3115,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( "(OOOii)", odc, orect, otext, - (int)active, (int)with_close_button)); + (int)active, close_button_state)); if (ro) { - if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { + if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { PyObject* o1 = PySequence_GetItem(ro, 0); PyObject* o2 = PySequence_GetItem(ro, 1); - if (!wxRect_helper(o1, &out_rect)) + PyObject* o3 = PySequence_GetItem(ro, 2); + if (!wxRect_helper(o1, &out_tab_rect)) PyErr_SetString(PyExc_TypeError, errmsg); - else if (!PyInt_Check(o2)) + else if (!wxRect_helper(o2, &out_button_rect)) + PyErr_SetString(PyExc_TypeError, errmsg); + else if (!PyInt_Check(o3)) PyErr_SetString(PyExc_TypeError, errmsg); else - *x_extent = PyInt_AsLong(o2); + *x_extent = PyInt_AsLong(o3); Py_DECREF(o1); Py_DECREF(o2); + Py_DECREF(o3); } else { PyErr_SetString(PyExc_TypeError, errmsg); @@ -3141,7 +3146,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, with_close_button, out_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } @@ -3183,7 +3188,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual wxSize GetTabSize( wxDC* dc, const wxString& caption, bool active, - bool with_close_button, + int close_button_state, int* x_extent) { bool found; @@ -3195,7 +3200,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, (int)with_close_button)); + "(OOi)", odc, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3221,7 +3226,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, with_close_button, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); return rv; } @@ -7508,7 +7513,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_AuiManager__AddPane1(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -7520,24 +7525,30 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_0(PyObject *SWIGUNUSEDPARM(s int res2 = 0 ; void *argp3 = 0 ; int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "window",(char *) "pane_info", NULL + }; - if ((nobjs < 3) || (nobjs > 3)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiManager__AddPane1",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_AddPane" "', expected argument " "1"" of type '" "wxAuiManager *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager__AddPane1" "', expected argument " "1"" of type '" "wxAuiManager *""'"); } arg1 = reinterpret_cast< wxAuiManager * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_AddPane" "', expected argument " "2"" of type '" "wxWindow *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager__AddPane1" "', expected argument " "2"" of type '" "wxWindow *""'"); } arg2 = reinterpret_cast< wxWindow * >(argp2); - res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager__AddPane1" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiManager__AddPane1" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } arg3 = reinterpret_cast< wxAuiPaneInfo * >(argp3); { @@ -7555,7 +7566,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_AuiManager_AddPane(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -7569,19 +7580,26 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(s void *argp3 = 0 ; int res3 = 0 ; wxPoint temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "window",(char *) "pane_info",(char *) "drop_pos", NULL + }; - if ((nobjs < 4) || (nobjs > 4)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiManager_AddPane",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_AddPane" "', expected argument " "1"" of type '" "wxAuiManager *""'"); } arg1 = reinterpret_cast< wxAuiManager * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_AddPane" "', expected argument " "2"" of type '" "wxWindow *""'"); } arg2 = reinterpret_cast< wxWindow * >(argp2); - res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } @@ -7591,7 +7609,7 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg3 = reinterpret_cast< wxAuiPaneInfo * >(argp3); { arg4 = &temp4; - if ( ! wxPoint_helper(swig_obj[3], &arg4)) SWIG_fail; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7608,25 +7626,6 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[5]; - - if (!(argc = SWIG_Python_UnpackTuple(args,"AuiManager_AddPane",0,4,argv))) SWIG_fail; - --argc; - if (argc == 3) { - return _wrap_AuiManager_AddPane__SWIG_0(self, argc, argv); - } - if (argc == 4) { - return _wrap_AuiManager_AddPane__SWIG_1(self, argc, argv); - } - -fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'AuiManager_AddPane'"); - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiManager__AddPane2(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; @@ -11559,9 +11558,10 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO wxRect *arg3 = 0 ; wxString *arg4 = 0 ; bool arg5 ; - bool arg6 ; + int arg6 ; wxRect *arg7 = (wxRect *) 0 ; - int *arg8 = (int *) 0 ; + wxRect *arg8 = (wxRect *) 0 ; + int *arg9 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -11570,12 +11570,14 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO bool temp4 = false ; bool val5 ; int ecode5 = 0 ; - bool val6 ; + int val6 ; int ecode6 = 0 ; void *argp7 = 0 ; int res7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11584,11 +11586,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "out_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11613,24 +11616,29 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); } arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_bool(obj5, &val6); + ecode6 = SWIG_AsVal_int(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); } - arg6 = static_cast< bool >(val6); + arg6 = static_cast< int >(val6); res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res7)) { SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); } arg7 = reinterpret_cast< wxRect * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_int, 0 | 0 ); + res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); + } + arg8 = reinterpret_cast< wxRect * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); } - arg8 = reinterpret_cast< int * >(argp8); + arg9 = reinterpret_cast< int * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8); + (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11748,7 +11756,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), wxDC *arg2 = (wxDC *) 0 ; wxString *arg3 = 0 ; bool arg4 ; - bool arg5 ; + int arg5 ; int *arg6 = (int *) 0 ; wxSize result; void *argp1 = 0 ; @@ -11758,7 +11766,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), bool temp3 = false ; bool val4 ; int ecode4 = 0 ; - bool val5 ; + int val5 ; int ecode5 = 0 ; void *argp6 = 0 ; int res6 = 0 ; @@ -11769,7 +11777,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; @@ -11793,11 +11801,11 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); } arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_bool(obj4, &val5); + ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); } - arg5 = static_cast< bool >(val5); + arg5 = static_cast< int >(val5); res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); if (!SWIG_IsOK(res6)) { SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); @@ -13857,6 +13865,44 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabContainer_RemoveButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "id", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_RemoveButton",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_RemoveButton" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); + } + arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_RemoveButton" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveButton(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; @@ -14989,7 +15035,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiManager__GetPaneByWidget", (PyCFunction) _wrap_AuiManager__GetPaneByWidget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager__GetPaneByName", (PyCFunction) _wrap_AuiManager__GetPaneByName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_GetAllPanes", (PyCFunction)_wrap_AuiManager_GetAllPanes, METH_O, NULL}, - { (char *)"AuiManager_AddPane", _wrap_AuiManager_AddPane, METH_VARARGS, NULL}, + { (char *)"AuiManager__AddPane1", (PyCFunction) _wrap_AuiManager__AddPane1, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiManager_AddPane", (PyCFunction) _wrap_AuiManager_AddPane, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager__AddPane2", (PyCFunction) _wrap_AuiManager__AddPane2, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_InsertPane", (PyCFunction) _wrap_AuiManager_InsertPane, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_DetachPane", (PyCFunction) _wrap_AuiManager_DetachPane, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -15181,6 +15228,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabContainer_SetMeasuringFont", (PyCFunction) _wrap_AuiTabContainer_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL}, { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabContainer_RemoveButton", (PyCFunction) _wrap_AuiTabContainer_RemoveButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL}, { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -17965,8 +18013,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); SWIG_Python_SetConstant(d, "AUI_NB_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxAUI_NB_DEFAULT_STYLE))); diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 192eea0b69..7e489cc7f6 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -611,12 +611,13 @@ class AuiManager(_core.EvtHandler): """GetAllPanes(self) -> wxAuiPaneInfoArray""" return _aui.AuiManager_GetAllPanes(*args, **kwargs) - def AddPane(*args): - """ - AddPane(self, Window window, AuiPaneInfo pane_info) -> bool - AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool - """ - return _aui.AuiManager_AddPane(*args) + def _AddPane1(*args, **kwargs): + """_AddPane1(self, Window window, AuiPaneInfo pane_info) -> bool""" + return _aui.AuiManager__AddPane1(*args, **kwargs) + + def AddPane(*args, **kwargs): + """AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool""" + return _aui.AuiManager_AddPane(*args, **kwargs) def _AddPane2(*args, **kwargs): """_AddPane2(self, Window window, int direction=LEFT, String caption=wxEmptyString) -> bool""" @@ -726,7 +727,7 @@ class AuiManager(_core.EvtHandler): pane info, and defaults to ``wx.LEFT``. The pane caption may also be specified as an extra parameter in this form. """ - if type(info) == PaneInfo: + if type(info) == AuiPaneInfo: return self._AddPane1(window, info) else: @@ -990,8 +991,8 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS AUI_NB_DEFAULT_STYLE = _aui.AUI_NB_DEFAULT_STYLE @@ -1020,8 +1021,9 @@ class AuiTabArt(object): def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, bool with_close_button, - Rect out_rect, int x_extent) + DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, + Rect out_tab_rect, Rect out_button_rect, + int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) @@ -1034,7 +1036,7 @@ class AuiTabArt(object): def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, bool with_close_button, + GetTabSize(self, DC dc, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) @@ -1219,6 +1221,10 @@ class AuiTabContainer(object): """SetRect(self, Rect rect)""" return _aui.AuiTabContainer_SetRect(*args, **kwargs) + def RemoveButton(*args, **kwargs): + """RemoveButton(self, int id)""" + return _aui.AuiTabContainer_RemoveButton(*args, **kwargs) + def AddButton(*args, **kwargs): """ AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 463abac3fe..ec224a2724 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -3099,12 +3099,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const wxRect& in_rect, const wxString& caption, bool active, - bool with_close_button, - wxRect* out_rect, + int close_button_state, + wxRect* out_tab_rect, + wxRect* out_button_rect, int* x_extent) { bool found; - const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)"; + const char* errmsg = "DrawTab should return a sequence containing (tab_rect, button_rect, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); @@ -3114,20 +3115,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( "(OOOii)", odc, orect, otext, - (int)active, (int)with_close_button)); + (int)active, close_button_state)); if (ro) { - if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { + if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { PyObject* o1 = PySequence_GetItem(ro, 0); PyObject* o2 = PySequence_GetItem(ro, 1); - if (!wxRect_helper(o1, &out_rect)) + PyObject* o3 = PySequence_GetItem(ro, 2); + if (!wxRect_helper(o1, &out_tab_rect)) PyErr_SetString(PyExc_TypeError, errmsg); - else if (!PyInt_Check(o2)) + else if (!wxRect_helper(o2, &out_button_rect)) + PyErr_SetString(PyExc_TypeError, errmsg); + else if (!PyInt_Check(o3)) PyErr_SetString(PyExc_TypeError, errmsg); else - *x_extent = PyInt_AsLong(o2); + *x_extent = PyInt_AsLong(o3); Py_DECREF(o1); Py_DECREF(o2); + Py_DECREF(o3); } else { PyErr_SetString(PyExc_TypeError, errmsg); @@ -3141,7 +3146,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, with_close_button, out_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } @@ -3183,7 +3188,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual wxSize GetTabSize( wxDC* dc, const wxString& caption, bool active, - bool with_close_button, + int close_button_state, int* x_extent) { bool found; @@ -3195,7 +3200,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, (int)with_close_button)); + "(OOi)", odc, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3221,7 +3226,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, with_close_button, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); return rv; } @@ -7508,7 +7513,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_AuiManager__AddPane1(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -7520,24 +7525,30 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_0(PyObject *SWIGUNUSEDPARM(s int res2 = 0 ; void *argp3 = 0 ; int res3 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "window",(char *) "pane_info", NULL + }; - if ((nobjs < 3) || (nobjs > 3)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiManager__AddPane1",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_AddPane" "', expected argument " "1"" of type '" "wxAuiManager *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager__AddPane1" "', expected argument " "1"" of type '" "wxAuiManager *""'"); } arg1 = reinterpret_cast< wxAuiManager * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_AddPane" "', expected argument " "2"" of type '" "wxWindow *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager__AddPane1" "', expected argument " "2"" of type '" "wxWindow *""'"); } arg2 = reinterpret_cast< wxWindow * >(argp2); - res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager__AddPane1" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } if (!argp3) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiManager__AddPane1" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } arg3 = reinterpret_cast< wxAuiPaneInfo * >(argp3); { @@ -7555,7 +7566,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_AuiManager_AddPane(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; wxWindow *arg2 = (wxWindow *) 0 ; @@ -7569,19 +7580,26 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(s void *argp3 = 0 ; int res3 = 0 ; wxPoint temp4 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "window",(char *) "pane_info",(char *) "drop_pos", NULL + }; - if ((nobjs < 4) || (nobjs > 4)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiManager_AddPane",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiManager, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiManager_AddPane" "', expected argument " "1"" of type '" "wxAuiManager *""'"); } arg1 = reinterpret_cast< wxAuiManager * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiManager_AddPane" "', expected argument " "2"" of type '" "wxWindow *""'"); } arg2 = reinterpret_cast< wxWindow * >(argp2); - res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); + res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxAuiPaneInfo, 0 | 0); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiManager_AddPane" "', expected argument " "3"" of type '" "wxAuiPaneInfo const &""'"); } @@ -7591,7 +7609,7 @@ SWIGINTERN PyObject *_wrap_AuiManager_AddPane__SWIG_1(PyObject *SWIGUNUSEDPARM(s arg3 = reinterpret_cast< wxAuiPaneInfo * >(argp3); { arg4 = &temp4; - if ( ! wxPoint_helper(swig_obj[3], &arg4)) SWIG_fail; + if ( ! wxPoint_helper(obj3, &arg4)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -7608,25 +7626,6 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiManager_AddPane(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[5]; - - if (!(argc = SWIG_Python_UnpackTuple(args,"AuiManager_AddPane",0,4,argv))) SWIG_fail; - --argc; - if (argc == 3) { - return _wrap_AuiManager_AddPane__SWIG_0(self, argc, argv); - } - if (argc == 4) { - return _wrap_AuiManager_AddPane__SWIG_1(self, argc, argv); - } - -fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'AuiManager_AddPane'"); - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiManager__AddPane2(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiManager *arg1 = (wxAuiManager *) 0 ; @@ -11559,9 +11558,10 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO wxRect *arg3 = 0 ; wxString *arg4 = 0 ; bool arg5 ; - bool arg6 ; + int arg6 ; wxRect *arg7 = (wxRect *) 0 ; - int *arg8 = (int *) 0 ; + wxRect *arg8 = (wxRect *) 0 ; + int *arg9 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -11570,12 +11570,14 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO bool temp4 = false ; bool val5 ; int ecode5 = 0 ; - bool val6 ; + int val6 ; int ecode6 = 0 ; void *argp7 = 0 ; int res7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11584,11 +11586,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "out_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11613,24 +11616,29 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); } arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_bool(obj5, &val6); + ecode6 = SWIG_AsVal_int(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); } - arg6 = static_cast< bool >(val6); + arg6 = static_cast< int >(val6); res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res7)) { SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); } arg7 = reinterpret_cast< wxRect * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_int, 0 | 0 ); + res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); + } + arg8 = reinterpret_cast< wxRect * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); } - arg8 = reinterpret_cast< int * >(argp8); + arg9 = reinterpret_cast< int * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8); + (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11748,7 +11756,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), wxDC *arg2 = (wxDC *) 0 ; wxString *arg3 = 0 ; bool arg4 ; - bool arg5 ; + int arg5 ; int *arg6 = (int *) 0 ; wxSize result; void *argp1 = 0 ; @@ -11758,7 +11766,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), bool temp3 = false ; bool val4 ; int ecode4 = 0 ; - bool val5 ; + int val5 ; int ecode5 = 0 ; void *argp6 = 0 ; int res6 = 0 ; @@ -11769,7 +11777,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "with_close_button",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; @@ -11793,11 +11801,11 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); } arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_bool(obj4, &val5); + ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); } - arg5 = static_cast< bool >(val5); + arg5 = static_cast< int >(val5); res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); if (!SWIG_IsOK(res6)) { SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); @@ -13857,6 +13865,44 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabContainer_RemoveButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "id", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiTabContainer_RemoveButton",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_RemoveButton" "', expected argument " "1"" of type '" "wxAuiTabContainer *""'"); + } + arg1 = reinterpret_cast< wxAuiTabContainer * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiTabContainer_RemoveButton" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->RemoveButton(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabContainer_AddButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabContainer *arg1 = (wxAuiTabContainer *) 0 ; @@ -14989,7 +15035,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiManager__GetPaneByWidget", (PyCFunction) _wrap_AuiManager__GetPaneByWidget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager__GetPaneByName", (PyCFunction) _wrap_AuiManager__GetPaneByName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_GetAllPanes", (PyCFunction)_wrap_AuiManager_GetAllPanes, METH_O, NULL}, - { (char *)"AuiManager_AddPane", _wrap_AuiManager_AddPane, METH_VARARGS, NULL}, + { (char *)"AuiManager__AddPane1", (PyCFunction) _wrap_AuiManager__AddPane1, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiManager_AddPane", (PyCFunction) _wrap_AuiManager_AddPane, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager__AddPane2", (PyCFunction) _wrap_AuiManager__AddPane2, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_InsertPane", (PyCFunction) _wrap_AuiManager_InsertPane, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiManager_DetachPane", (PyCFunction) _wrap_AuiManager_DetachPane, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -15181,6 +15228,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabContainer_SetMeasuringFont", (PyCFunction) _wrap_AuiTabContainer_SetMeasuringFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_DoShowHide", (PyCFunction)_wrap_AuiTabContainer_DoShowHide, METH_O, NULL}, { (char *)"AuiTabContainer_SetRect", (PyCFunction) _wrap_AuiTabContainer_SetRect, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabContainer_RemoveButton", (PyCFunction) _wrap_AuiTabContainer_RemoveButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_AddButton", (PyCFunction) _wrap_AuiTabContainer_AddButton, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabContainer_GetTabOffset", (PyCFunction)_wrap_AuiTabContainer_GetTabOffset, METH_O, NULL}, { (char *)"AuiTabContainer_SetTabOffset", (PyCFunction) _wrap_AuiTabContainer_SetTabOffset, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -17959,8 +18007,8 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); SWIG_Python_SetConstant(d, "AUI_NB_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxAUI_NB_DEFAULT_STYLE)));