X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7e1ad7d93cdba76983c43d7e0289a00be5a935c..eb7350290f690dd3e4d92bcf0515027678b3374f:/src/cocoa/mdi.mm diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm index a0c8022306..a501ee6723 100644 --- a/src/cocoa/mdi.mm +++ b/src/cocoa/mdi.mm @@ -95,10 +95,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - bool success = wxFrame::Create(parent,winid,title,pos,size,style,name); - if(success) - OnCreateClient(); - return success; + if ( !wxFrame::Create(parent,winid,title,pos,size,style,name) ) + return false; + + m_clientWindow = OnCreateClient(); + + return m_clientWindow != NULL; } wxMDIParentFrame::~wxMDIParentFrame() @@ -127,36 +129,12 @@ void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame *child) SetActiveChild(NULL); } -wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const -{ - return m_currentChild; -} - void wxMDIParentFrame::SetActiveChild(wxMDIChildFrame *child) { m_currentChild = child; wxMenuBarManager::GetInstance()->UpdateMenuBar(); } -wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const -{ - return m_clientWindow; -} - -wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() -{ - m_clientWindow = new wxMDIClientWindow( this ); - return m_clientWindow; -} - -void wxMDIParentFrame::ActivateNext() -{ -} - -void wxMDIParentFrame::ActivatePrevious() -{ -} - wxMenuBar *wxMDIParentFrame::GetAppMenuBar(wxCocoaNSWindow *win) { if(m_currentChild && (win==this)) @@ -323,22 +301,9 @@ bool wxMDIChildFrame::Destroy() // ======================================================================== IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow) -wxMDIClientWindow::wxMDIClientWindow() -{ -} - -wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style) - :wxWindow(parent, wxID_ANY) -{ -} - -wxMDIClientWindow::~wxMDIClientWindow() -{ -} - -bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style) +bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { - return false; + return Create(parent, wxID_ANY, wxPoint(0, 0), wxSize(0, 0), style); } -#endif +#endif // wxUSE_MDI