X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/205fef01e0fe2d7d277111bb1d7267d7d4900056..f2c88494b6978bee502f4c856ba9dc7e3b7c3954:/src/cocoa/frame.mm?ds=sidebyside diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm index 9277c357f6..fd61328157 100644 --- a/src/cocoa/frame.mm +++ b/src/cocoa/frame.mm @@ -1,19 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/frame.mm +// Name: src/cocoa/frame.mm // Purpose: wxFrame // Author: David Elliott // Modified by: // Created: 2003/03/16 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/frame.h" + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" - #include "wx/frame.h" #include "wx/menu.h" #include "wx/toolbar.h" #include "wx/statusbr.h" @@ -179,6 +181,8 @@ void wxFrame::UpdateFrameNSView() if(m_frameToolBar) { NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview(); + // If the toolbar doesn't have a superview then set it to our + // content view. if(![tbarNSView superview]) [m_frameNSView addSubview: tbarNSView]; // Do this after addSubView so that SetSize can work @@ -278,18 +282,10 @@ wxToolBar* wxFrame::CreateToolBar(long style, const wxString& name) { wxAutoNSAutoreleasePool pool; - wxFrameBase::CreateToolBar(style,winid,name); - if(m_frameToolBar) - { - m_frameToolBar->CocoaRemoveFromParent(); - m_frameToolBar->SetOwningFrame(this); - } - UpdateFrameNSView(); - return m_frameToolBar; + return wxFrameBase::CreateToolBar(style,winid,name); } #endif // wxUSE_TOOLBAR void wxFrame::PositionStatusBar() { } -