As of src/common/framecmn.cpp revision 1.60 the wxFrameBase::CreateToolBar

method now uses SetToolBar rather than updating m_frameToolBar directly.
Therefore, we no longer need to duplicate the code from SetToolBar in
CreateToolBar.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index 7c21de34f4a022bdda3ac979c663b8f8a22ef3a2..90ff51a4ffc80115ef05aa9e5b067633213c0c11 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -179,6 +179,8 @@ void wxFrame::UpdateFrameNSView()
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
     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
         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];
         // Do this after addSubView so that SetSize can work


@@ -278,14 +280,7 @@ wxToolBar* wxFrame::CreateToolBar(long style,
                                       const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
                                       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
 
 }
 #endif // wxUSE_TOOLBAR