X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24c7767fc8e093be0f0790c78daeb12b4e58579b..15e42bb781df7f069cc3b008f2a8004e398820af:/src/cocoa/frame.mm?ds=sidebyside diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm index 9d3ff26566..78b82d4f8c 100644 --- a/src/cocoa/frame.mm +++ b/src/cocoa/frame.mm @@ -1,19 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWindows license +// 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" @@ -25,14 +27,13 @@ #import #import #import +#import // wxFrame BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) - void wxFrame::Init() { m_frameNSView = nil; @@ -56,16 +57,18 @@ wxFrame::~wxFrame() [m_frameNSView release]; } +// ------------------------------------------------------------------- +// Menubar void wxFrame::AttachMenuBar(wxMenuBar *mbar) { wxFrameBase::AttachMenuBar(mbar); - wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this); + wxMenuBarManager::GetInstance()->UpdateMenuBar(); } void wxFrame::DetachMenuBar() { wxFrameBase::DetachMenuBar(); - wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this); + wxMenuBarManager::GetInstance()->UpdateMenuBar(); } void wxFrame::SetMenuBar(wxMenuBar *menubar) @@ -78,9 +81,55 @@ void wxFrame::SetMenuBar(wxMenuBar *menubar) wxFrameBase::DetachMenuBar(); wxFrameBase::AttachMenuBar(menubar); - wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this); + wxMenuBarManager::GetInstance()->UpdateMenuBar(); +} + +wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win) +{ + if(GetMenuBar()) + return GetMenuBar(); + return wxFrameBase::GetAppMenuBar(win); +} + +void wxFrame::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) +{ + 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) + { + 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()); + } + else + wxLogDebug(wxT("Received wxMenuItemAction in NSWindow delegate from an unknown menu item.")); +} + +bool wxFrame::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) +{ + 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); @@ -97,6 +146,14 @@ void wxFrame::CocoaSetWxWindowSize(int width, int height) 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 @@ -111,7 +168,7 @@ void wxFrame::CocoaReplaceView(WX_NSView oldView, WX_NSView 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]; @@ -122,8 +179,12 @@ void wxFrame::UpdateFrameNSView() 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; @@ -149,7 +210,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); + 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; @@ -184,6 +245,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, wxWindowID winid, const wxString& name) { + wxAutoNSAutoreleasePool pool; wxFrameBase::CreateStatusBar(number,style,winid,name); if(m_frameStatusBar) { @@ -198,6 +260,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()) @@ -207,6 +270,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar) if(m_frameToolBar) { m_frameToolBar->CocoaRemoveFromParent(); + m_frameToolBar->SetOwningFrame(this); } UpdateFrameNSView(); } @@ -215,17 +279,11 @@ wxToolBar* wxFrame::CreateToolBar(long style, 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() { } -