/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/frame.mm
+// Name: src/cocoa/frame.mm
// Purpose: wxFrame
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWidgets licence
+// Licence: wxWindows 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"
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];
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
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()
{
}
-