// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows license
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/frame.h"
-#include "wx/menu.h"
-#include "wx/menuitem.h"
-#include "wx/app.h"
-#include "wx/log.h"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
+#include "wx/wxprec.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"
+#endif // WX_PRECOMP
#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/mbarman.h"
#import <AppKit/NSWindow.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSView.h>
+#import <AppKit/NSMenuItem.h>
// wxFrame
[m_frameNSView release];
}
-void wxFrame::Cocoa_wxMenuItemAction(wxMenuItem& item)
+// -------------------------------------------------------------------
+// Menubar
+void wxFrame::AttachMenuBar(wxMenuBar *mbar)
{
- Command(item.GetId());
+ wxFrameBase::AttachMenuBar(mbar);
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
}
-void wxFrame::AttachMenuBar(wxMenuBar *mbar)
+void wxFrame::DetachMenuBar()
{
- wxFrameBase::AttachMenuBar(mbar);
- if(m_frameMenuBar)
+ wxFrameBase::DetachMenuBar();
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
+}
+
+void wxFrame::SetMenuBar(wxMenuBar *menubar)
+{
+ if ( menubar == GetMenuBar() )
{
- wxLogDebug("Attached menu");
- [m_cocoaNSWindow setMenu:m_frameMenuBar->GetNSMenu()];
+ // nothing to do
+ return;
}
+
+ wxFrameBase::DetachMenuBar();
+ wxFrameBase::AttachMenuBar(menubar);
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
}
-void wxFrame::DetachMenuBar()
+wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+ if(GetMenuBar())
+ return GetMenuBar();
+ return wxFrameBase::GetAppMenuBar(win);
+}
+
+void wxFrame::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem)
{
- if(m_frameMenuBar)
+ wxLogTrace(wxTRACE_COCOA,wxT("wxFrame::wxMenuItemAction"));
+ wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
+ wxCHECK_RET(item,wxT("wxMenuItemAction received but no wxMenuItem exists!"));
+
+ wxMenu *menu = item->GetMenu();
+ wxCHECK_RET(menu,wxT("wxMenuItemAction received but wxMenuItem is not in a wxMenu!"));
+
+ // Since we're handling the delegate messages there's a very good chance
+ // we'll receive a menu action from an item with a nil target.
+ wxMenuBar *menubar = menu->GetMenuBar();
+ if(menubar)
{
- [m_cocoaNSWindow setMenu:nil];
+ wxFrame *frame = menubar->GetFrame();
+ wxASSERT_MSG(frame==this, wxT("Received wxMenuItemAction in NSWindow delegate from a menu item attached to a different frame."));
+ frame->ProcessCommand(item->GetId());
}
- wxFrameBase::DetachMenuBar();
+ else
+ wxLogDebug(wxT("Received wxMenuItemAction in NSWindow delegate from an unknown menu item."));
}
-bool wxFrame::Show(bool show)
+bool wxFrame::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem)
{
- wxAutoNSAutoreleasePool pool;
- bool ret = wxFrameBase::Show(show);
- if(show && GetMenuBar())
- [wxTheApp->GetNSApplication() setMenu:GetMenuBar()->GetNSMenu() ];
- return ret;
+ SEL itemAction = [menuItem action];
+ if(itemAction == @selector(wxMenuItemAction:))
+ {
+ wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
+ wxCHECK_MSG(item,false,wxT("validateMenuItem received but no wxMenuItem exists!"));
+ // TODO: do more sanity checking
+ return item->IsEnabled();
+ }
+ // TODO: else if cut/copy/paste
+ wxLogDebug(wxT("Asked to validate an unknown menu item"));
+ return false;
}
+// -------------------------------------------------------------------
+// Origin/Size
wxPoint wxFrame::GetClientAreaOrigin() const
{
return wxPoint(0,0);
{
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
}
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;
[tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin];
tbarheight = tbarRect.size.height;
}
+#endif //wxUSE_TOOLBAR
float sbarheight = 0.0;
if(m_frameStatusBar)
{
[sbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
sbarheight = sbarRect.size.height;
}
- wxLogDebug("frame height=%f, tbar=%f, sbar=%f",frameRect.size.height,tbarheight,sbarheight);
+ 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;
if(m_frameStatusBar)
{
[m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
- [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewNotSizable];
+ [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
if(m_frameStatusBar->GetParent())
- m_frameStatusBar->GetParent()->CocoaAddChild(m_frameToolBar);
+ m_frameStatusBar->GetParent()->CocoaAddChild(m_frameStatusBar);
}
m_frameStatusBar = statusbar;
if(m_frameStatusBar)
wxWindowID winid,
const wxString& name)
{
+ wxAutoNSAutoreleasePool pool;
wxFrameBase::CreateStatusBar(number,style,winid,name);
if(m_frameStatusBar)
{
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: NSViewNotSizable];
+ [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
if(m_frameToolBar->GetParent())
m_frameToolBar->GetParent()->CocoaAddChild(m_frameToolBar);
}
if(m_frameToolBar)
{
m_frameToolBar->CocoaRemoveFromParent();
+ m_frameToolBar->SetOwningFrame(this);
}
UpdateFrameNSView();
}
wxWindowID winid,
const wxString& name)
{
- wxFrameBase::CreateToolBar(style,winid,name);
- if(m_frameToolBar)
- {
- m_frameToolBar->CocoaRemoveFromParent();
- }
- UpdateFrameNSView();
- return m_frameToolBar;
+ wxAutoNSAutoreleasePool pool;
+ return wxFrameBase::CreateToolBar(style,winid,name);
}
+#endif // wxUSE_TOOLBAR
void wxFrame::PositionStatusBar()
{
projects / wxWidgets.git / blobdiff