X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ec59a2bf91002b18e5d2e7f7d77ea9ffeb8e43b..5acb46e0cde04773273611029a3b439d74c67bec:/wxPython/src/aui.i diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index e5047351e1..68202adbf1 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -139,7 +139,8 @@ The following example shows a simple implementation that utilizes #define wxDEPRECATED(decl) -// We'll let SWIG handle the function overloading for these +// We'll skip making wrappers for these, they have overloads that take a +// wxSize or wxPoint %ignore wxPaneInfo::MaxSize(int x, int y); %ignore wxPaneInfo::MinSize(int x, int y); %ignore wxPaneInfo::BestSize(int x, int y); @@ -169,12 +170,21 @@ The following example shows a simple implementation that utilizes } +%nokwargs wxAuiTabContainer::SetActivePage; + +%pythonAppend wxAuiTabCtrl::wxAuiTabCtrl "self._setOORInfo(self)"; + +%pythonAppend wxAuiMultiNotebook::wxAuiMultiNotebook "self._setOORInfo(self)"; +%pythonAppend wxAuiMultiNotebook::wxAuiMultiNotebook() "self._setOORInfo(self)"; +%ignore wxAuiMultiNotebook::~wxAuiMultiNotebook; +%rename(PreAuiMultiNotebook) wxAuiMultiNotebook::wxAuiMultiNotebook(); + //--------------------------------------------------------------------------- // Get all our defs from the REAL header files. %include framemanager.h %include dockart.h %include floatpane.h - +%include auibook.h //--------------------------------------------------------------------------- // Methods to inject into the FrameManager class that will sort out calls to @@ -241,6 +251,7 @@ The following example shows a simple implementation that utilizes //--------------------------------------------------------------------------- %{ +// A wxDocArt lcass that knows how to forward virtuals to Python methods class wxPyDockArt : public wxDefaultDockArt { wxPyDockArt() : wxDefaultDockArt() {} @@ -253,6 +264,7 @@ class wxPyDockArt : public wxDefaultDockArt DEC_PYCALLBACK__INTCOLOUR(SetColour); virtual void DrawSash(wxDC& dc, + wxWindow* window, int orientation, const wxRect& rect) { @@ -260,18 +272,20 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawSash"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", - odc, orientation, orect)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)", + odc, owin, orientation, orect)); Py_DECREF(odc); Py_DECREF(orect); } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawSash(dc, orientation, rect); + wxDefaultDockArt::DrawSash(dc, window, orientation, rect); } virtual void DrawBackground(wxDC& dc, + wxWindow* window, int orientation, const wxRect& rect) { @@ -279,18 +293,20 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", - odc, orientation, orect)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)", + odc, owin, orientation, orect)); Py_DECREF(odc); Py_DECREF(orect); } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawBackground(dc, orientation, rect); + wxDefaultDockArt::DrawBackground(dc, window, orientation, rect); } virtual void DrawCaption(wxDC& dc, + wxWindow* window, const wxString& text, const wxRect& rect, wxPaneInfo& pane) @@ -299,11 +315,12 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawCaption"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* otext = wx2PyString(text); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOO)", - odc, otext, orect, opane)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)", + odc, owin, otext, orect, opane)); Py_DECREF(odc); Py_DECREF(otext); Py_DECREF(orect); @@ -311,10 +328,11 @@ class wxPyDockArt : public wxDefaultDockArt } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawCaption(dc, text, rect, pane); + wxDefaultDockArt::DrawCaption(dc, window, text, rect, pane); } virtual void DrawGripper(wxDC& dc, + wxWindow* window, const wxRect& rect, wxPaneInfo& pane) { @@ -322,19 +340,21 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawGripper"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOO)", odc, owin, orect, opane)); Py_DECREF(odc); Py_DECREF(orect); Py_DECREF(opane); } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawGripper(dc, rect, pane); + wxDefaultDockArt::DrawGripper(dc, window, rect, pane); } virtual void DrawBorder(wxDC& dc, + wxWindow* window, const wxRect& rect, wxPaneInfo& pane) { @@ -342,6 +362,7 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBorder"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane)); @@ -351,10 +372,11 @@ class wxPyDockArt : public wxDefaultDockArt } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawBorder(dc, rect, pane); + wxDefaultDockArt::DrawBorder(dc, window, rect, pane); } virtual void DrawPaneButton(wxDC& dc, + wxWindow* window, int button, int button_state, const wxRect& rect, @@ -364,10 +386,11 @@ class wxPyDockArt : public wxDefaultDockArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawPaneButton"))) { PyObject* odc = wxPyMake_wxObject(&dc, false); + PyObject* owin = wxPyMake_wxObject(window, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiIOO)", - odc, button, button_state, + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiIOO)", + odc, owin, button, button_state, orect, opane)); Py_DECREF(odc); Py_DECREF(orect); @@ -375,7 +398,7 @@ class wxPyDockArt : public wxDefaultDockArt } wxPyEndBlockThreads(blocked); if (! found) - wxDefaultDockArt::DrawPaneButton(dc, button, button_state, rect, pane); + wxDefaultDockArt::DrawPaneButton(dc, window, button, button_state, rect, pane); } PYPRIVATE;