#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);
%rename(_AddPane1) wxFrameManager::AddPane(wxWindow* window, const wxPaneInfo& pane_info);
%rename(_AddPane2) wxFrameManager::AddPane(wxWindow* window, int direction = wxLEFT,
- const wxString& caption = wxEmptyString);
+ const wxString& caption = wxEmptyString);
+%rename(AddPaneAtPos) wxFrameManager::AddPane(wxWindow* window,
+ const wxPaneInfo& pane_info,
+ const wxPoint& drop_pos);
// A typemap for the return value of wxFrameManager::GetAllPanes
%typemap(out) wxPaneInfoArray& {
}
+%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
}
}
+%extend wxDockInfo {
+ ~wxDockInfo() {}
+}
+
+%extend wxDockUIPart {
+ ~wxDockUIPart() {}
+}
+
+%extend wxPaneButton {
+ ~wxPaneButton() {}
+}
+
//---------------------------------------------------------------------------
%{
+// A wxDocArt class that knows how to forward virtuals to Python methods
class wxPyDockArt : public wxDefaultDockArt
{
wxPyDockArt() : wxDefaultDockArt() {}
DEC_PYCALLBACK__INTCOLOUR(SetColour);
virtual void DrawSash(wxDC& dc,
+ wxWindow* window,
int orientation,
const wxRect& rect)
{
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(owin);
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)
{
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(owin);
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)
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(owin);
Py_DECREF(otext);
Py_DECREF(orect);
Py_DECREF(opane);
}
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)
{
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)
{
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));
Py_DECREF(odc);
+ Py_DECREF(owin);
Py_DECREF(orect);
Py_DECREF(opane);
}
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,
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(owin);
Py_DECREF(orect);
Py_DECREF(opane);
}
wxPyEndBlockThreads(blocked);
if (! found)
- wxDefaultDockArt::DrawPaneButton(dc, button, button_state, rect, pane);
+ wxDefaultDockArt::DrawPaneButton(dc, window, button, button_state, rect, pane);
}
PYPRIVATE;
class wxPyDockArt : public wxDefaultDockArt
{
%pythonAppend wxPyDockArt "self._setCallbackInfo(self, PyDockArt)"
- PyDocArt();
+ wxPyDocArt();
+
+};
+
+
+//---------------------------------------------------------------------------
+
+%extend wxAuiMultiNotebook {
+ %property(PageCount, GetPageCount, doc="See `GetPageCount`");
+ %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`");
+}
+
+
+%extend wxAuiNotebookEvent {
+ %property(OldSelection, GetOldSelection, SetOldSelection, doc="See `GetOldSelection` and `SetOldSelection`");
+ %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`");
+}
+
+
+%extend wxAuiTabContainer {
+ %property(ActivePage, GetActivePage, SetActivePage, doc="See `GetActivePage` and `SetActivePage`");
+ %property(PageCount, GetPageCount, doc="See `GetPageCount`");
+ %property(Pages, GetPages, doc="See `GetPages`");
+}
+
+
+%extend wxFrameManager {
+ %property(AllPanes, GetAllPanes, doc="See `GetAllPanes`");
+ %property(ArtProvider, GetArtProvider, SetArtProvider, doc="See `GetArtProvider` and `SetArtProvider`");
+ %property(Flags, GetFlags, SetFlags, doc="See `GetFlags` and `SetFlags`");
+ %property(ManagedWindow, GetManagedWindow, SetManagedWindow, doc="See `GetManagedWindow` and `SetManagedWindow`");
+}
+
+
+%extend wxFrameManagerEvent {
+ %property(Button, GetButton, SetButton, doc="See `GetButton` and `SetButton`");
+ %property(DC, GetDC, SetDC, doc="See `GetDC` and `SetDC`");
+ %property(Pane, GetPane, SetPane, doc="See `GetPane` and `SetPane`");
+}
+
+
+//---------------------------------------------------------------------------
+
+%{
+// A wxTabArt class that knows how to forward virtuals to Python methods
+class wxPyTabArt : public wxDefaultTabArt
+{
+ wxPyTabArt() : wxDefaultTabArt() {}
+
+
+ virtual void DrawBackground( wxDC* dc,
+ const wxRect& rect )
+ {
+ bool found;
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
+ if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) {
+ PyObject* odc = wxPyMake_wxObject(dc, false);
+ PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", odc, orect));
+ Py_DECREF(odc);
+ Py_DECREF(orect);
+ }
+ wxPyEndBlockThreads(blocked);
+ if (!found)
+ wxDefaultTabArt::DrawBackground(dc, rect);
+ }
+
+ virtual void DrawTab( wxDC* dc,
+ const wxRect& in_rect,
+ const wxString& caption,
+ bool active,
+ wxRect* out_rect,
+ int* x_extent)
+ {
+ bool found;
+ const char* errmsg = "DrawTab should return a sequence containing (out_rect, x_extent)";
+ wxPyBlock_t blocked = wxPyBeginBlockThreads();
+ if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) {
+ PyObject* odc = wxPyMake_wxObject(dc, false);
+ PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+ PyObject* otext = wx2PyString(caption);
+ PyObject* ro;
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOi)", odc, orect, otext, (int)active));
+ if (ro) {
+ if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+ PyObject* o1 = PySequence_GetItem(ro, 0);
+ PyObject* o2 = PySequence_GetItem(ro, 1);
+ if (!wxRect_helper(o1, &out_rect))
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ else if (!PyInt_Check(o2))
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ else
+ *x_extent = PyInt_AsLong(o2);
+
+ Py_DECREF(o1);
+ Py_DECREF(o2);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ }
+ Py_DECREF(ro);
+ }
+
+ Py_DECREF(odc);
+ Py_DECREF(orect);
+ Py_DECREF(otext);
+ }
+ wxPyEndBlockThreads(blocked);
+ if (!found)
+ wxDefaultTabArt::DrawTab(dc, in_rect, caption, active, out_rect, x_extent);
+ }
+
+ virtual void DrawButton( wxDC* dc,
+ const wxRect& in_rect,
+ int bitmap_id,
+ int button_state,
+ int orientation,
+ const wxBitmap& bitmap_override,
+ wxRect* out_rect)
+ {
+ bool found;
+ 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* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0);
+ PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0);
+ PyObject* ro;
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect,
+ bitmap_id, button_state, orientation,
+ obmp));
+ if (ro) {
+ if (!wxRect_helper(ro, &out_rect))
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ Py_DECREF(ro);
+ }
+
+ Py_DECREF(odc);
+ Py_DECREF(orect);
+ Py_DECREF(obmp);
+ }
+ wxPyEndBlockThreads(blocked);
+ if (!found)
+ wxDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect);
+ }
+
+
+ virtual wxSize GetTabSize( wxDC* dc,
+ const wxString& caption,
+ bool active,
+ int* x_extent)
+ {
+ bool found;
+ wxSize rv, *prv = &rv;
+ 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* otext = wx2PyString(caption);
+ PyObject* ro;
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOi)", odc, otext, (int)active));
+ if (ro) {
+ if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+ PyObject* o1 = PySequence_GetItem(ro, 0);
+ PyObject* o2 = PySequence_GetItem(ro, 1);
+ if (!wxSize_helper(o1, &prv))
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ else if (!PyInt_Check(o2))
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ else
+ *x_extent = PyInt_AsLong(o2);
+
+ Py_DECREF(o1);
+ Py_DECREF(o2);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ }
+ Py_DECREF(ro);
+ }
+
+ Py_DECREF(odc);
+ Py_DECREF(otext);
+ }
+ wxPyEndBlockThreads(blocked);
+ if (!found)
+ rv = wxDefaultTabArt::GetTabSize(dc, caption, active, x_extent);
+ return rv;
+ }
+
+
+
+ DEC_PYCALLBACK__FONT(SetNormalFont);
+ DEC_PYCALLBACK__FONT(SetSelectedFont);
+ DEC_PYCALLBACK__FONT(SetMeasuringFont);
+ DEC_PYCALLBACK_INT_WIN(GetBestTabCtrlSize);
+
+ PYPRIVATE;
};
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetNormalFont);
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetSelectedFont);
+IMP_PYCALLBACK__FONT(wxPyTabArt, wxDefaultTabArt, SetMeasuringFont);
+IMP_PYCALLBACK_INT_WIN(wxPyTabArt, wxDefaultTabArt, GetBestTabCtrlSize);
+%}
+
+
+DocStr(wxPyTabArt,
+"This version of the `TabArt` class has been instrumented to be
+subclassable in Python and to reflect all calls to the C++ base class
+methods to the Python methods implemented in the derived class.", "");
+
+class wxPyTabArt : public wxDefaultTabArt
+{
+ %pythonAppend wxPyTabArt "self._setCallbackInfo(self, PyTabArt)"
+ wxPyTabArt();
+
+};
+
+
+//---------------------------------------------------------------------------
#undef wxUSE_AUI
#undef WXDLLIMPEXP_AUI
projects / wxWidgets.git / blobdiff