X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243f5c2d917b77474b6d159fc338ec669d70cc91..df7f0a04ba6c573a8e13738d63d31e5395640ae3:/src/cocoa/frame.mm

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index 9e529f1187..ca12e36e29 100644
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -138,6 +138,8 @@ void wxFrame::UpdateFrameNSView()
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];
+        // Do this after addSubView so that SetSize can work
+        m_frameToolBar->SetSize(m_frameToolBar->DoGetBestSize());
         NSRect tbarRect = [tbarNSView frame];
         tbarRect.size.width = frameRect.size.width;
         tbarRect.origin.x = 0.0;
@@ -163,7 +165,7 @@ void wxFrame::UpdateFrameNSView()
         [sbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
         sbarheight = sbarRect.size.height;
     }
-    wxLogDebug("frame height=%f, tbar=%f, sbar=%f",frameRect.size.height,tbarheight,sbarheight);
+    wxLogDebug(wxT("frame height=%f, tbar=%f, sbar=%f"),frameRect.size.height,tbarheight,sbarheight);
     NSRect innerRect = [m_cocoaNSView frame];
     innerRect.size.height = frameRect.size.height - tbarheight - sbarheight;
     innerRect.origin.y = sbarheight;
@@ -198,6 +200,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
                                           wxWindowID winid,
                                           const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     wxFrameBase::CreateStatusBar(number,style,winid,name);
     if(m_frameStatusBar)
     {
@@ -212,6 +215,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if(m_frameToolBar)
     {
+        m_frameToolBar->SetOwningFrame(NULL);
         [m_frameToolBar->GetNSViewForSuperview() removeFromSuperview];
         [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameToolBar->GetParent())
@@ -221,6 +225,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if(m_frameToolBar)
     {
         m_frameToolBar->CocoaRemoveFromParent();
+        m_frameToolBar->SetOwningFrame(this);
     }
     UpdateFrameNSView();
 }
@@ -229,10 +234,12 @@ wxToolBar* wxFrame::CreateToolBar(long style,
                                       wxWindowID winid,
                                       const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     wxFrameBase::CreateToolBar(style,winid,name);
     if(m_frameToolBar)
     {
         m_frameToolBar->CocoaRemoveFromParent();
+        m_frameToolBar->SetOwningFrame(this);
     }
     UpdateFrameNSView();
     return m_frameToolBar;