From: Robin Dunn Date: Mon, 6 Nov 2006 20:55:15 +0000 (+0000) Subject: changes to match AUI API changes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d95b9f2b6328f7239efe27c925df52cf2c879fb5 changes to match AUI API changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index 44eaeb0f64..4a21567d82 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -494,14 +494,14 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyAuiTabArt() : wxAuiDefaultTabArt() {} - virtual void DrawBackground( wxDC* dc, + virtual void DrawBackground( wxDC& dc, wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); @@ -514,7 +514,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } - virtual void DrawTab( wxDC* dc, + virtual void DrawTab( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, const wxString& caption, @@ -528,7 +528,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt 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); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); @@ -572,7 +572,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } - virtual void DrawButton( wxDC* dc, + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, @@ -585,7 +585,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "DrawButton should return a wxRect"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); @@ -610,13 +610,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } -// TODO -// virtual int ShowWindowList( -// wxWindow* wnd, -// const wxArrayString& items, -// int active_idx); - - virtual wxSize GetTabSize( wxDC* dc, + virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, bool active, @@ -628,7 +622,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; @@ -664,6 +658,12 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt return rv; } +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); + // TODO // virtual int GetBestTabCtrlSize(wxWindow* wnd); diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index cac179bde2..28b11774cb 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -991,6 +991,7 @@ AUI_NB_RIGHT = _aui.AUI_NB_RIGHT 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_TAB_EXTERNAL_MOVE = _aui.AUI_NB_TAB_EXTERNAL_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON @@ -1036,10 +1037,6 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) - def ShowWindowList(*args, **kwargs): - """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" - return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) - def GetTabSize(*args, **kwargs): """ GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, @@ -1047,6 +1044,10 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetBestTabCtrlSize(*args, **kwargs): """GetBestTabCtrlSize(self, Window wnd) -> int""" return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs) @@ -1075,10 +1076,6 @@ class AuiNotebookEvent(_core.NotifyEvent): """SetSelection(self, int s)""" return _aui.AuiNotebookEvent_SetSelection(*args, **kwargs) - def SetOldSelection(*args, **kwargs): - """SetOldSelection(self, int s)""" - return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) - def GetSelection(*args, **kwargs): """ GetSelection(self) -> int @@ -1088,12 +1085,25 @@ class AuiNotebookEvent(_core.NotifyEvent): """ return _aui.AuiNotebookEvent_GetSelection(*args, **kwargs) + def SetOldSelection(*args, **kwargs): + """SetOldSelection(self, int s)""" + return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) + def GetOldSelection(*args, **kwargs): """GetOldSelection(self) -> int""" return _aui.AuiNotebookEvent_GetOldSelection(*args, **kwargs) + def SetDragSource(*args, **kwargs): + """SetDragSource(self, AuiNotebook s)""" + return _aui.AuiNotebookEvent_SetDragSource(*args, **kwargs) + + def GetDragSource(*args, **kwargs): + """GetDragSource(self) -> AuiNotebook""" + return _aui.AuiNotebookEvent_GetDragSource(*args, **kwargs) + old_selection = property(_aui.AuiNotebookEvent_old_selection_get, _aui.AuiNotebookEvent_old_selection_set) selection = property(_aui.AuiNotebookEvent_selection_get, _aui.AuiNotebookEvent_selection_set) + drag_source = property(_aui.AuiNotebookEvent_drag_source_get, _aui.AuiNotebookEvent_drag_source_set) OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebookEvent_swigregister(AuiNotebookEvent) @@ -1347,18 +1357,22 @@ def PreAuiNotebook(*args, **kwargs): self._setOORInfo(self) return val +wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_AUINOTEBOOK_BUTTON = _aui.wxEVT_COMMAND_AUINOTEBOOK_BUTTON wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG wxEVT_COMMAND_AUINOTEBOOK_END_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_END_DRAG wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION = _aui.wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION +wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND = _aui.wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND +EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 ) EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 ) EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 ) EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 ) EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 ) +EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 ) class PyAuiDockArt(AuiDefaultDockArt): """ diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index 6c39705e76..08dd13148a 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -3079,14 +3079,14 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyAuiTabArt() : wxAuiDefaultTabArt() {} - virtual void DrawBackground( wxDC* dc, + virtual void DrawBackground( wxDC& dc, wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); @@ -3099,7 +3099,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } - virtual void DrawTab( wxDC* dc, + virtual void DrawTab( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, const wxString& caption, @@ -3113,7 +3113,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt 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); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); @@ -3157,7 +3157,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } - virtual void DrawButton( wxDC* dc, + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, @@ -3170,7 +3170,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "DrawButton should return a wxRect"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); @@ -3195,13 +3195,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } -// TODO -// virtual int ShowWindowList( -// wxWindow* wnd, -// const wxArrayString& items, -// int active_idx); - - virtual wxSize GetTabSize( wxDC* dc, + virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, bool active, @@ -3213,7 +3207,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; @@ -3249,6 +3243,12 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt return rv; } +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); + // TODO // virtual int GetBestTabCtrlSize(wxWindow* wnd); @@ -11530,7 +11530,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; void *argp1 = 0 ; @@ -11554,9 +11554,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11570,7 +11573,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); + (arg1)->DrawBackground(*arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11584,7 +11587,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; wxString *arg5 = 0 ; @@ -11631,9 +11634,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11677,7 +11683,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); + (arg1)->DrawTab(*arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11699,7 +11705,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; int arg5 ; @@ -11743,9 +11749,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11787,7 +11796,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); + (arg1)->DrawButton(*arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11798,84 +11807,10 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxWindow *arg2 = (wxWindow *) 0 ; - wxArrayString *arg3 = 0 ; - int arg4 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - bool temp3 = false ; - int val4 ; - int ecode4 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); - } - arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); - } - arg2 = reinterpret_cast< wxWindow * >(argp2); - { - if (! PySequence_Check(obj2)) { - PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); - SWIG_fail; - } - arg3 = new wxArrayString; - temp3 = true; - int i, len=PySequence_Length(obj2); - for (i=0; iAdd(*s); - delete s; - Py_DECREF(item); - } - } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_From_int(static_cast< int >(result)); - { - if (temp3) delete arg3; - } - return resultobj; -fail: - { - if (temp3) delete arg3; - } - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxString *arg4 = 0 ; bool arg5 ; @@ -11912,9 +11847,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11944,7 +11882,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); + result = (arg1)->GetTabSize(*arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11963,6 +11901,80 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetBestTabCtrlSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; @@ -12147,6 +12159,34 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; @@ -12185,7 +12225,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; int result; @@ -12197,12 +12237,12 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPAR swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -12213,10 +12253,48 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; - int result; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "s", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiNotebookEvent_SetDragSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragSource(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -12225,16 +12303,16 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSED swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); + result = (wxAuiNotebook *)((wxAuiNotebookEvent const *)arg1)->GetDragSource(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); return resultobj; fail: return NULL; @@ -12347,6 +12425,59 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"AuiNotebookEvent_drag_source_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxAuiNotebook, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + if (arg1) (arg1)->drag_source = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_get" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + result = (wxAuiNotebook *) ((arg1)->drag_source); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebookEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -15292,8 +15423,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, { (char *)"new_AuiDefaultTabArt", (PyCFunction)_wrap_new_AuiDefaultTabArt, METH_NOARGS, NULL}, @@ -15302,13 +15433,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiDefaultTabArt_swiginit", AuiDefaultTabArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_AuiNotebookEvent", (PyCFunction) _wrap_new_AuiNotebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_SetSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetOldSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetOldSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetDragSource", (PyCFunction) _wrap_AuiNotebookEvent_SetDragSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebookEvent_GetDragSource", (PyCFunction)_wrap_AuiNotebookEvent_GetDragSource, METH_O, NULL}, { (char *)"AuiNotebookEvent_old_selection_set", _wrap_AuiNotebookEvent_old_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_old_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_old_selection_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_selection_set", _wrap_AuiNotebookEvent_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_selection_get, METH_O, NULL}, + { (char *)"AuiNotebookEvent_drag_source_set", _wrap_AuiNotebookEvent_drag_source_set, METH_VARARGS, NULL}, + { (char *)"AuiNotebookEvent_drag_source_get", (PyCFunction)_wrap_AuiNotebookEvent_drag_source_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_swigregister", AuiNotebookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_swiginit", AuiNotebookEvent_swiginit, METH_VARARGS, NULL}, { (char *)"AuiNotebookPage_window_set", _wrap_AuiNotebookPage_window_set, METH_VARARGS, NULL}, @@ -18143,17 +18278,20 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_BOTTOM",SWIG_From_int(static_cast< int >(wxAUI_NB_BOTTOM))); 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_TAB_EXTERNAL_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_EXTERNAL_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_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_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))); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BUTTON)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND)); } diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index cac179bde2..28b11774cb 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -991,6 +991,7 @@ AUI_NB_RIGHT = _aui.AUI_NB_RIGHT 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_TAB_EXTERNAL_MOVE = _aui.AUI_NB_TAB_EXTERNAL_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON @@ -1036,10 +1037,6 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) - def ShowWindowList(*args, **kwargs): - """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" - return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) - def GetTabSize(*args, **kwargs): """ GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, @@ -1047,6 +1044,10 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetBestTabCtrlSize(*args, **kwargs): """GetBestTabCtrlSize(self, Window wnd) -> int""" return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs) @@ -1075,10 +1076,6 @@ class AuiNotebookEvent(_core.NotifyEvent): """SetSelection(self, int s)""" return _aui.AuiNotebookEvent_SetSelection(*args, **kwargs) - def SetOldSelection(*args, **kwargs): - """SetOldSelection(self, int s)""" - return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) - def GetSelection(*args, **kwargs): """ GetSelection(self) -> int @@ -1088,12 +1085,25 @@ class AuiNotebookEvent(_core.NotifyEvent): """ return _aui.AuiNotebookEvent_GetSelection(*args, **kwargs) + def SetOldSelection(*args, **kwargs): + """SetOldSelection(self, int s)""" + return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) + def GetOldSelection(*args, **kwargs): """GetOldSelection(self) -> int""" return _aui.AuiNotebookEvent_GetOldSelection(*args, **kwargs) + def SetDragSource(*args, **kwargs): + """SetDragSource(self, AuiNotebook s)""" + return _aui.AuiNotebookEvent_SetDragSource(*args, **kwargs) + + def GetDragSource(*args, **kwargs): + """GetDragSource(self) -> AuiNotebook""" + return _aui.AuiNotebookEvent_GetDragSource(*args, **kwargs) + old_selection = property(_aui.AuiNotebookEvent_old_selection_get, _aui.AuiNotebookEvent_old_selection_set) selection = property(_aui.AuiNotebookEvent_selection_get, _aui.AuiNotebookEvent_selection_set) + drag_source = property(_aui.AuiNotebookEvent_drag_source_get, _aui.AuiNotebookEvent_drag_source_set) OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebookEvent_swigregister(AuiNotebookEvent) @@ -1347,18 +1357,22 @@ def PreAuiNotebook(*args, **kwargs): self._setOORInfo(self) return val +wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_AUINOTEBOOK_BUTTON = _aui.wxEVT_COMMAND_AUINOTEBOOK_BUTTON wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG wxEVT_COMMAND_AUINOTEBOOK_END_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_END_DRAG wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION = _aui.wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION +wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND = _aui.wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND +EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 ) EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 ) EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 ) EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 ) EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 ) +EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 ) class PyAuiDockArt(AuiDefaultDockArt): """ diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index 01eea472e4..3c88828ca7 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -3079,14 +3079,14 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyAuiTabArt() : wxAuiDefaultTabArt() {} - virtual void DrawBackground( wxDC* dc, + virtual void DrawBackground( wxDC& dc, wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); @@ -3099,7 +3099,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } - virtual void DrawTab( wxDC* dc, + virtual void DrawTab( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, const wxString& caption, @@ -3113,7 +3113,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt 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); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); @@ -3157,7 +3157,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } - virtual void DrawButton( wxDC* dc, + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, @@ -3170,7 +3170,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "DrawButton should return a wxRect"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); @@ -3195,13 +3195,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } -// TODO -// virtual int ShowWindowList( -// wxWindow* wnd, -// const wxArrayString& items, -// int active_idx); - - virtual wxSize GetTabSize( wxDC* dc, + virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, bool active, @@ -3213,7 +3207,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; @@ -3249,6 +3243,12 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt return rv; } +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); + // TODO // virtual int GetBestTabCtrlSize(wxWindow* wnd); @@ -11530,7 +11530,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; void *argp1 = 0 ; @@ -11554,9 +11554,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11570,7 +11573,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); + (arg1)->DrawBackground(*arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11584,7 +11587,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; wxString *arg5 = 0 ; @@ -11631,9 +11634,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11677,7 +11683,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); + (arg1)->DrawTab(*arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11699,7 +11705,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; int arg5 ; @@ -11743,9 +11749,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11787,7 +11796,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); + (arg1)->DrawButton(*arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11798,84 +11807,10 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxWindow *arg2 = (wxWindow *) 0 ; - wxArrayString *arg3 = 0 ; - int arg4 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - bool temp3 = false ; - int val4 ; - int ecode4 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); - } - arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); - } - arg2 = reinterpret_cast< wxWindow * >(argp2); - { - if (! PySequence_Check(obj2)) { - PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); - SWIG_fail; - } - arg3 = new wxArrayString; - temp3 = true; - int i, len=PySequence_Length(obj2); - for (i=0; iAdd(*s); - delete s; - Py_DECREF(item); - } - } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_From_int(static_cast< int >(result)); - { - if (temp3) delete arg3; - } - return resultobj; -fail: - { - if (temp3) delete arg3; - } - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxString *arg4 = 0 ; bool arg5 ; @@ -11912,9 +11847,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11944,7 +11882,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); + result = (arg1)->GetTabSize(*arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11963,6 +11901,80 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetBestTabCtrlSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; @@ -12147,6 +12159,34 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; @@ -12185,7 +12225,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; int result; @@ -12197,12 +12237,12 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPAR swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -12213,10 +12253,48 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; - int result; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "s", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiNotebookEvent_SetDragSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragSource(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -12225,16 +12303,16 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSED swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); + result = (wxAuiNotebook *)((wxAuiNotebookEvent const *)arg1)->GetDragSource(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); return resultobj; fail: return NULL; @@ -12347,6 +12425,59 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"AuiNotebookEvent_drag_source_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxAuiNotebook, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + if (arg1) (arg1)->drag_source = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_get" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + result = (wxAuiNotebook *) ((arg1)->drag_source); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebookEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -15292,8 +15423,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, { (char *)"new_AuiDefaultTabArt", (PyCFunction)_wrap_new_AuiDefaultTabArt, METH_NOARGS, NULL}, @@ -15302,13 +15433,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiDefaultTabArt_swiginit", AuiDefaultTabArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_AuiNotebookEvent", (PyCFunction) _wrap_new_AuiNotebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_SetSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetOldSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetOldSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetDragSource", (PyCFunction) _wrap_AuiNotebookEvent_SetDragSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebookEvent_GetDragSource", (PyCFunction)_wrap_AuiNotebookEvent_GetDragSource, METH_O, NULL}, { (char *)"AuiNotebookEvent_old_selection_set", _wrap_AuiNotebookEvent_old_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_old_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_old_selection_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_selection_set", _wrap_AuiNotebookEvent_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_selection_get, METH_O, NULL}, + { (char *)"AuiNotebookEvent_drag_source_set", _wrap_AuiNotebookEvent_drag_source_set, METH_VARARGS, NULL}, + { (char *)"AuiNotebookEvent_drag_source_get", (PyCFunction)_wrap_AuiNotebookEvent_drag_source_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_swigregister", AuiNotebookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_swiginit", AuiNotebookEvent_swiginit, METH_VARARGS, NULL}, { (char *)"AuiNotebookPage_window_set", _wrap_AuiNotebookPage_window_set, METH_VARARGS, NULL}, @@ -18149,17 +18284,20 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_BOTTOM",SWIG_From_int(static_cast< int >(wxAUI_NB_BOTTOM))); 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_TAB_EXTERNAL_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_EXTERNAL_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_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_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))); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BUTTON)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND)); } diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index cac179bde2..28b11774cb 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -991,6 +991,7 @@ AUI_NB_RIGHT = _aui.AUI_NB_RIGHT 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_TAB_EXTERNAL_MOVE = _aui.AUI_NB_TAB_EXTERNAL_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON @@ -1036,10 +1037,6 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) - def ShowWindowList(*args, **kwargs): - """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" - return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) - def GetTabSize(*args, **kwargs): """ GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, @@ -1047,6 +1044,10 @@ class AuiTabArt(object): """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetBestTabCtrlSize(*args, **kwargs): """GetBestTabCtrlSize(self, Window wnd) -> int""" return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs) @@ -1075,10 +1076,6 @@ class AuiNotebookEvent(_core.NotifyEvent): """SetSelection(self, int s)""" return _aui.AuiNotebookEvent_SetSelection(*args, **kwargs) - def SetOldSelection(*args, **kwargs): - """SetOldSelection(self, int s)""" - return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) - def GetSelection(*args, **kwargs): """ GetSelection(self) -> int @@ -1088,12 +1085,25 @@ class AuiNotebookEvent(_core.NotifyEvent): """ return _aui.AuiNotebookEvent_GetSelection(*args, **kwargs) + def SetOldSelection(*args, **kwargs): + """SetOldSelection(self, int s)""" + return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs) + def GetOldSelection(*args, **kwargs): """GetOldSelection(self) -> int""" return _aui.AuiNotebookEvent_GetOldSelection(*args, **kwargs) + def SetDragSource(*args, **kwargs): + """SetDragSource(self, AuiNotebook s)""" + return _aui.AuiNotebookEvent_SetDragSource(*args, **kwargs) + + def GetDragSource(*args, **kwargs): + """GetDragSource(self) -> AuiNotebook""" + return _aui.AuiNotebookEvent_GetDragSource(*args, **kwargs) + old_selection = property(_aui.AuiNotebookEvent_old_selection_get, _aui.AuiNotebookEvent_old_selection_set) selection = property(_aui.AuiNotebookEvent_selection_get, _aui.AuiNotebookEvent_selection_set) + drag_source = property(_aui.AuiNotebookEvent_drag_source_get, _aui.AuiNotebookEvent_drag_source_set) OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") _aui.AuiNotebookEvent_swigregister(AuiNotebookEvent) @@ -1347,18 +1357,22 @@ def PreAuiNotebook(*args, **kwargs): self._setOORInfo(self) return val +wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_AUINOTEBOOK_BUTTON = _aui.wxEVT_COMMAND_AUINOTEBOOK_BUTTON wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG wxEVT_COMMAND_AUINOTEBOOK_END_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_END_DRAG wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION = _aui.wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION +wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND = _aui.wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND +EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 ) EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 ) EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 ) EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 ) EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 ) EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 ) +EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 ) class PyAuiDockArt(AuiDefaultDockArt): """ diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index 6c39705e76..08dd13148a 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -3079,14 +3079,14 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyAuiTabArt() : wxAuiDefaultTabArt() {} - virtual void DrawBackground( wxDC* dc, + virtual void DrawBackground( wxDC& dc, wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); @@ -3099,7 +3099,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } - virtual void DrawTab( wxDC* dc, + virtual void DrawTab( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, const wxString& caption, @@ -3113,7 +3113,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt 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); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); @@ -3157,7 +3157,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } - virtual void DrawButton( wxDC* dc, + virtual void DrawButton( wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, @@ -3170,7 +3170,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "DrawButton should return a wxRect"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); @@ -3195,13 +3195,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } -// TODO -// virtual int ShowWindowList( -// wxWindow* wnd, -// const wxArrayString& items, -// int active_idx); - - virtual wxSize GetTabSize( wxDC* dc, + virtual wxSize GetTabSize( wxDC& dc, wxWindow* wnd, const wxString& caption, bool active, @@ -3213,7 +3207,7 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt const char* errmsg = "GetTabSize should return a sequence containing (size, x_extent)"; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { - PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* odc = wxPyMake_wxObject(&dc, false); PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; @@ -3249,6 +3243,12 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt return rv; } +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); + // TODO // virtual int GetBestTabCtrlSize(wxWindow* wnd); @@ -11530,7 +11530,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; void *argp1 = 0 ; @@ -11554,9 +11554,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11570,7 +11573,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); + (arg1)->DrawBackground(*arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11584,7 +11587,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; wxString *arg5 = 0 ; @@ -11631,9 +11634,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11677,7 +11683,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); + (arg1)->DrawTab(*arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11699,7 +11705,7 @@ fail: SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxRect *arg4 = 0 ; int arg5 ; @@ -11743,9 +11749,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11787,7 +11796,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); + (arg1)->DrawButton(*arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11798,84 +11807,10 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxWindow *arg2 = (wxWindow *) 0 ; - wxArrayString *arg3 = 0 ; - int arg4 ; - int result; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - bool temp3 = false ; - int val4 ; - int ecode4 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); - } - arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); - } - arg2 = reinterpret_cast< wxWindow * >(argp2); - { - if (! PySequence_Check(obj2)) { - PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); - SWIG_fail; - } - arg3 = new wxArrayString; - temp3 = true; - int i, len=PySequence_Length(obj2); - for (i=0; iAdd(*s); - delete s; - Py_DECREF(item); - } - } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_From_int(static_cast< int >(result)); - { - if (temp3) delete arg3; - } - return resultobj; -fail: - { - if (temp3) delete arg3; - } - return NULL; -} - - SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; - wxDC *arg2 = (wxDC *) 0 ; + wxDC *arg2 = 0 ; wxWindow *arg3 = (wxWindow *) 0 ; wxString *arg4 = 0 ; bool arg5 ; @@ -11912,9 +11847,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); } arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 | 0 ); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxDC, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC &""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); @@ -11944,7 +11882,7 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); + result = (arg1)->GetTabSize(*arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11963,6 +11901,80 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) 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_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetBestTabCtrlSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; @@ -12147,6 +12159,34 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; @@ -12185,7 +12225,7 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; int result; @@ -12197,12 +12237,12 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetSelection(PyObject *SWIGUNUSEDPAR swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetSelection(); + result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -12213,10 +12253,48 @@ fail: } -SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_SetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; - int result; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "s", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AuiNotebookEvent_SetDragSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_SetDragSource" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetDragSource(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetDragSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -12225,16 +12303,16 @@ SWIGINTERN PyObject *_wrap_AuiNotebookEvent_GetOldSelection(PyObject *SWIGUNUSED swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetOldSelection" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_GetDragSource" "', expected argument " "1"" of type '" "wxAuiNotebookEvent const *""'"); } arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxAuiNotebookEvent const *)arg1)->GetOldSelection(); + result = (wxAuiNotebook *)((wxAuiNotebookEvent const *)arg1)->GetDragSource(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_From_int(static_cast< int >(result)); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); return resultobj; fail: return NULL; @@ -12347,6 +12425,59 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *arg2 = (wxAuiNotebook *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject *swig_obj[2] ; + + if (!SWIG_Python_UnpackTuple(args,"AuiNotebookEvent_drag_source_set",2,2,swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxAuiNotebook, SWIG_POINTER_DISOWN | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiNotebookEvent_drag_source_set" "', expected argument " "2"" of type '" "wxAuiNotebook *""'"); + } + arg2 = reinterpret_cast< wxAuiNotebook * >(argp2); + if (arg1) (arg1)->drag_source = arg2; + + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AuiNotebookEvent_drag_source_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAuiNotebookEvent *arg1 = (wxAuiNotebookEvent *) 0 ; + wxAuiNotebook *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAuiNotebookEvent, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiNotebookEvent_drag_source_get" "', expected argument " "1"" of type '" "wxAuiNotebookEvent *""'"); + } + arg1 = reinterpret_cast< wxAuiNotebookEvent * >(argp1); + result = (wxAuiNotebook *) ((arg1)->drag_source); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAuiNotebook, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AuiNotebookEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -15292,8 +15423,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, { (char *)"new_AuiDefaultTabArt", (PyCFunction)_wrap_new_AuiDefaultTabArt, METH_NOARGS, NULL}, @@ -15302,13 +15433,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiDefaultTabArt_swiginit", AuiDefaultTabArt_swiginit, METH_VARARGS, NULL}, { (char *)"new_AuiNotebookEvent", (PyCFunction) _wrap_new_AuiNotebookEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_SetSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetOldSelection", (PyCFunction) _wrap_AuiNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiNotebookEvent_GetOldSelection", (PyCFunction)_wrap_AuiNotebookEvent_GetOldSelection, METH_O, NULL}, + { (char *)"AuiNotebookEvent_SetDragSource", (PyCFunction) _wrap_AuiNotebookEvent_SetDragSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiNotebookEvent_GetDragSource", (PyCFunction)_wrap_AuiNotebookEvent_GetDragSource, METH_O, NULL}, { (char *)"AuiNotebookEvent_old_selection_set", _wrap_AuiNotebookEvent_old_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_old_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_old_selection_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_selection_set", _wrap_AuiNotebookEvent_selection_set, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_selection_get", (PyCFunction)_wrap_AuiNotebookEvent_selection_get, METH_O, NULL}, + { (char *)"AuiNotebookEvent_drag_source_set", _wrap_AuiNotebookEvent_drag_source_set, METH_VARARGS, NULL}, + { (char *)"AuiNotebookEvent_drag_source_get", (PyCFunction)_wrap_AuiNotebookEvent_drag_source_get, METH_O, NULL}, { (char *)"AuiNotebookEvent_swigregister", AuiNotebookEvent_swigregister, METH_VARARGS, NULL}, { (char *)"AuiNotebookEvent_swiginit", AuiNotebookEvent_swiginit, METH_VARARGS, NULL}, { (char *)"AuiNotebookPage_window_set", _wrap_AuiNotebookPage_window_set, METH_VARARGS, NULL}, @@ -18143,17 +18278,20 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_BOTTOM",SWIG_From_int(static_cast< int >(wxAUI_NB_BOTTOM))); 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_TAB_EXTERNAL_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_EXTERNAL_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_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_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))); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BUTTON)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)); + PyDict_SetItemString(d, "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", PyInt_FromLong(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND)); }