X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34d71f81f4810c55092005c113039a8857422185..ddeca22ce86e16e0d67e1a7dd2102c8251ab4792:/wxPython/src/aui.i diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index c52977fd1f..ee3dcdb88f 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -134,8 +134,13 @@ The following example shows a simple implementation that utilizes // Preprocessor stuff so SWIG doesn't get confused when %include-ing // the aui .h files. +%ignore wxUSE_AUI; +%ignore wxUSE_MENUS; +%ignore wxABI_VERSION; #define wxUSE_AUI 1 #define wxUSE_MENUS 1 +#define wxABI_VERSION 99999 + #define WXDLLIMPEXP_AUI #define unsigned #define wxDEPRECATED(decl) @@ -197,6 +202,11 @@ The following example shows a simple implementation that utilizes %ignore wxAuiMDIParentFrame::~wxAuiMDIParentFrame; %rename(PreAuiMDIParentFrame) wxAuiMDIParentFrame::wxAuiMDIParentFrame(); +// Ignore these for now because they need a typemap for the return value, see below. +%ignore wxAuiMDIParentFrame::GetNotebook; +%ignore wxAuiMDIParentFrame::GetActiveChild; +%ignore wxAuiMDIParentFrame::GetClientWindow; + %pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame "self._setOORInfo(self)"; %pythonAppend wxAuiMDIChildFrame::wxAuiMDIChildFrame() "val._setOORInfo(val)"; %ignore wxAuiMDIChildFrame::~wxAuiMDIChildFrame; @@ -208,6 +218,8 @@ The following example shows a simple implementation that utilizes %rename(PreAuiMDIClientWindow) wxAuiMDIClientWindow::wxAuiMDIClientWindow(); +%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); } + //--------------------------------------------------------------------------- // Get all our defs from the REAL header files. @@ -295,12 +307,43 @@ The following example shows a simple implementation that utilizes ~wxAuiPaneButton() {} } +%extend wxAuiMDIParentFrame { + %typemap(out) wxAuiNotebook* { $result = wxPyMake_wxObject($1, $owner); } + %typemap(out) wxAuiMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); } + %typemap(out) wxAuiMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); } + + %rename(GetNotebook) _GetNotebook; + %rename(GetActiveChild) _GetActiveChild; + %rename(GetClientWindow) _GetClientWindow; + + wxAuiNotebook* _GetNotebook() const + { + return self->GetNotebook(); + } + + wxAuiMDIChildFrame* _GetActiveChild() const + { + return self->GetActiveChild(); + } + + wxAuiMDIClientWindow* _GetClientWindow() const + { + return self->GetClientWindow(); + } + + %typemap(out) wxAuiNotebook*; + %typemap(out) wxAuiMDIChildFrame*; + %typemap(out) wxAuiMDIClientWindow*; +} + + //--------------------------------------------------------------------------- %{ // A wxDocArt class that knows how to forward virtuals to Python methods class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: wxPyAuiDockArt() : wxAuiDefaultDockArt() {} DEC_PYCALLBACK_INT_INT(GetMetric); @@ -474,8 +517,9 @@ methods to the Python methods implemented in the derived class.", ""); class wxPyAuiDockArt : public wxAuiDefaultDockArt { +public: %pythonAppend wxPyAuiDockArt setCallbackInfo(PyAuiDockArt) - wxPyAuiDocArt(); + wxPyAuiDockArt(); }; @@ -522,6 +566,7 @@ class wxPyAuiDockArt : public wxAuiDefaultDockArt // A wxTabArt class that knows how to forward virtuals to Python methods class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: wxPyAuiTabArt() : wxAuiDefaultTabArt() {} @@ -729,6 +774,7 @@ methods to the Python methods implemented in the derived class.", ""); class wxPyAuiTabArt : public wxAuiDefaultTabArt { +public: %pythonAppend wxPyAuiTabArt setCallbackInfo(PyAuiTabArt) wxPyAuiTabArt(); @@ -737,9 +783,4 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt //--------------------------------------------------------------------------- -#undef wxUSE_AUI -#undef wxUSE_MENUS -#undef WXDLLIMPEXP_AUI - -//---------------------------------------------------------------------------