+void wxFrame::CocoaSetWxWindowSize(int width, int height)
+{
+ if(m_frameStatusBar)
+ height += m_frameStatusBar->GetSize().y;
+#if wxUSE_TOOLBAR
+ if(m_frameToolBar)
+ height += m_frameToolBar->GetSize().y;
+#endif //wxUSE_TOOLBAR
+ wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
+}
+
+// -------------------------------------------------------------------
+WX_NSView wxFrame::GetNonClientNSView()
+{
+ if(m_frameNSView)
+ return m_frameNSView;
+ return GetNSViewForSuperview();
+}
+
+void wxFrame::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
+{
+ // If we have the additional toolbar/statbar view, then the
+ // default replaceSubview will work. Otherwise, the old view
+ // should be the content view and should be replaced that way
+ if(m_frameNSView)
+ wxWindow::CocoaReplaceView(oldView, newView);
+ else
+ wxTopLevelWindow::CocoaReplaceView(oldView, newView);
+}
+
+void wxFrame::UpdateFrameNSView()
+{
+ if(!m_frameNSView)
+ { // NOTE: We only need a plain NSView here since we don't associate it with ourselves.
+ m_frameNSView = [[NSView alloc] initWithFrame:[[m_cocoaNSWindow contentView] frame]];
+ [m_cocoaNSWindow setContentView: m_frameNSView];
+ [m_frameNSView addSubview:m_cocoaNSView];
+ }
+ NSRect frameRect = [m_frameNSView frame];
+ float tbarheight = 0.0;
+#if wxUSE_TOOLBAR
+ 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
+ m_frameToolBar->SetSize(m_frameToolBar->DoGetBestSize());
+ NSRect tbarRect = [tbarNSView frame];
+ tbarRect.size.width = frameRect.size.width;
+ tbarRect.origin.x = 0.0;
+ tbarRect.origin.y = frameRect.size.height - tbarRect.size.height;
+ [tbarNSView setFrame:tbarRect];
+ // width expands, bottom margin expands
+ [tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin];
+ tbarheight = tbarRect.size.height;
+ }
+#endif //wxUSE_TOOLBAR
+ float sbarheight = 0.0;
+ if(m_frameStatusBar)
+ {
+ NSView *sbarNSView = m_frameStatusBar->GetNSViewForSuperview();
+ if(![sbarNSView superview])
+ [m_frameNSView addSubview: sbarNSView];
+ NSRect sbarRect = [sbarNSView frame];
+ sbarRect.size.width = frameRect.size.width;
+ sbarRect.origin.x = 0.0;
+ sbarRect.origin.y = 0.0;
+ [sbarNSView setFrame:sbarRect];
+ // width expands, top margin expands
+ [sbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
+ sbarheight = sbarRect.size.height;
+ }
+ wxLogTrace(wxTRACE_COCOA,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;
+ [m_cocoaNSView setFrame:innerRect];
+ [m_cocoaNSView setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
+ // Don't let the frame get smaller than the toolbar+statusbar height
+ NSRect frameMinRect = [NSWindow frameRectForContentRect:
+ NSMakeRect(0.0,0.0,0.0,tbarheight+sbarheight)
+ styleMask: [m_cocoaNSWindow styleMask]];
+ [m_cocoaNSWindow setMinSize:frameMinRect.size];
+}
+
+void wxFrame::SetStatusBar(wxStatusBar *statusbar)
+{
+ if(m_frameStatusBar)
+ {
+ [m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
+ [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
+ if(m_frameStatusBar->GetParent())
+ m_frameStatusBar->GetParent()->CocoaAddChild(m_frameStatusBar);
+ }
+ m_frameStatusBar = statusbar;
+ if(m_frameStatusBar)
+ {
+ m_frameStatusBar->CocoaRemoveFromParent();
+ }
+ UpdateFrameNSView();
+}
+
+wxStatusBar* wxFrame::CreateStatusBar(int number,
+ long style,
+ wxWindowID winid,
+ const wxString& name)
+{
+ wxAutoNSAutoreleasePool pool;
+ wxFrameBase::CreateStatusBar(number,style,winid,name);
+ if(m_frameStatusBar)
+ {
+ m_frameStatusBar->CocoaRemoveFromParent();
+ }
+ UpdateFrameNSView();
+ return m_frameStatusBar;
+}
+
+#if wxUSE_TOOLBAR
+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())
+ m_frameToolBar->GetParent()->CocoaAddChild(m_frameToolBar);
+ }
+ m_frameToolBar = toolbar;
+ if(m_frameToolBar)
+ {
+ m_frameToolBar->CocoaRemoveFromParent();
+ m_frameToolBar->SetOwningFrame(this);
+ }
+ UpdateFrameNSView();
+}
+
+wxToolBar* wxFrame::CreateToolBar(long style,
+ wxWindowID winid,
+ const wxString& name)
+{
+ wxAutoNSAutoreleasePool pool;
+ return wxFrameBase::CreateToolBar(style,winid,name);
+}
+#endif // wxUSE_TOOLBAR
+
+void wxFrame::PositionStatusBar()
+{
+}