Fix for bug #1681189, use the right typemap for GetActiveChild, etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-20 22:30:27 +00:00
parent 411f2d350b
commit b028366c4a

View File

@@ -202,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;
@@ -213,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.
@@ -300,6 +307,36 @@ 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*;
}
//---------------------------------------------------------------------------
%{