X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc77f30f423b59b826103bd28c57a437c1553ab..ab7049776d45e622f621dd06216a4c1a1ad34b15:/src/cocoa/menu.mm diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm index f0fc49998a..b02bb35b34 100644 --- a/src/cocoa/menu.mm +++ b/src/cocoa/menu.mm @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/menu.cpp +// Name: src/cocoa/menu.mm // Purpose: wxMenu and wxMenuBar implementation // Author: David Elliott // Modified by: // Created: 2002/12/09 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -18,15 +18,18 @@ // ---------------------------------------------------------------------------- #include "wx/wxprec.h" + +#include "wx/menu.h" + #ifndef WX_PRECOMP - #include "wx/menu.h" #include "wx/log.h" #endif // WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import -#import +#include "wx/cocoa/objc/NSMenu.h" #if wxUSE_MENUS @@ -38,37 +41,37 @@ // wxMenu implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) - bool wxMenu::Create(const wxString& title, long style) { -#if 0 - if(!title) - return CocoaCreate("wxMenu"); -#endif - return CocoaCreate(title); + wxAutoNSAutoreleasePool pool; + m_cocoaNSMenu = [[WX_GET_OBJC_CLASS(WXNSMenu) alloc] initWithTitle: wxNSStringWithWxString(title)]; + AssociateNSMenu(m_cocoaNSMenu); + return true; } wxMenu::~wxMenu() { + DisassociateNSMenu(m_cocoaNSMenu); + if(!m_cocoaDeletes) + [m_cocoaNSMenu release]; } -bool wxMenu::DoAppend(wxMenuItem *item) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { wxAutoNSAutoreleasePool pool; if(!wxMenuBase::DoAppend(item)) - return false; + return NULL; [m_cocoaNSMenu addItem: item->GetNSMenuItem()]; - return true; + return item; } -bool wxMenu::DoInsert(unsigned long pos, wxMenuItem *item) +wxMenuItem* wxMenu::DoInsert(unsigned long pos, wxMenuItem *item) { wxAutoNSAutoreleasePool pool; if(!wxMenuBase::DoInsert(pos,item)) - return false; + return NULL; [m_cocoaNSMenu insertItem:item->GetNSMenuItem() atIndex:pos]; - return true; + return item; } wxMenuItem* wxMenu::DoRemove(wxMenuItem *item) @@ -80,31 +83,75 @@ wxMenuItem* wxMenu::DoRemove(wxMenuItem *item) return retitem; } +// This autoreleases the menu on the assumption that something is +// going to retain it shortly (for instance, it is going to be returned from +// an overloaded [NSStatusItem menu] or from the applicationDockMenu: +// NSApplication delegate method. +// +// It then sets a bool flag m_cocoaDeletes. When the NSMenu is dealloc'd +// (dealloc is the Cocoa destructor) we delete ourselves. In this manner we +// can be available for Cocoa calls until Cocoa is finished with us. +// +// I can see very few reasons to undo this. Nevertheless, it is implemented. +void wxMenu::SetCocoaDeletes(bool cocoaDeletes) +{ + if(m_cocoaDeletes==cocoaDeletes) + return; + m_cocoaDeletes = cocoaDeletes; + if(m_cocoaDeletes) + [m_cocoaNSMenu autorelease]; + else + [m_cocoaNSMenu retain]; +} + +void wxMenu::Cocoa_dealloc() +{ + if(m_cocoaDeletes) + delete this; +} + // ============================================================================ // wxMenuBar implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) bool wxMenuBar::Create(long style) { - if(!CocoaCreate("wxMenuBar")) - return false; + wxAutoNSAutoreleasePool pool; + m_cocoaNSMenu = [[NSMenu alloc] initWithTitle: @"wxMenuBar"]; + + NSMenuItem *dummyItem = [[NSMenuItem alloc] initWithTitle:@"App menu" + /* Note: title gets clobbered by app name anyway */ + action:nil keyEquivalent:@""]; + [m_cocoaNSMenu addItem:dummyItem]; + [dummyItem release]; return true; } +wxMenuBar::wxMenuBar(size_t n, + wxMenu *menus[], + const wxString titles[], + long style) +{ + Create(style); + + for ( size_t i = 0; i < n; ++i ) + Append(menus[i], titles[i]); +} + wxMenuBar::~wxMenuBar() { + [m_cocoaNSMenu release]; } bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { wxAutoNSAutoreleasePool pool; - wxLogDebug("append menu=%p, title=%s",menu,title.c_str()); + wxLogTrace(wxTRACE_COCOA,wxT("append menu=%p, title=%s"),menu,title.c_str()); if(!wxMenuBarBase::Append(menu,title)) return false; wxASSERT(menu); wxASSERT(menu->GetNSMenu()); - NSString *menuTitle = [[NSString alloc] initWithCString: wxStripMenuCodes(title).c_str()]; + NSString *menuTitle = wxInitNSStringWithWxString([NSString alloc], wxStripMenuCodes(title)); NSMenuItem *newItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:NULL keyEquivalent:@""]; [menu->GetNSMenu() setTitle:menuTitle]; [newItem setSubmenu:menu->GetNSMenu()]; @@ -119,17 +166,21 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { wxAutoNSAutoreleasePool pool; - wxLogDebug("insert pos=%lu, menu=%p, title=%s",pos,menu,title.c_str()); + wxLogTrace(wxTRACE_COCOA,wxT("insert pos=%lu, menu=%p, title=%s"),pos,menu,title.c_str()); + // Get the current menu at this position + wxMenu *nextmenu = GetMenu(pos); if(!wxMenuBarBase::Insert(pos,menu,title)) return false; wxASSERT(menu); wxASSERT(menu->GetNSMenu()); - NSString *menuTitle = [[NSString alloc] initWithCString: title.c_str()]; + NSString *menuTitle = wxInitNSStringWithWxString([NSString alloc], title); NSMenuItem *newItem = [[NSMenuItem alloc] initWithTitle:menuTitle action:NULL keyEquivalent:@""]; [menu->GetNSMenu() setTitle:menuTitle]; [newItem setSubmenu:menu->GetNSMenu()]; - [m_cocoaNSMenu insertItem:newItem atIndex:pos]; + int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:nextmenu->GetNSMenu()]; + wxASSERT(itemindex>=0); + [m_cocoaNSMenu insertItem:newItem atIndex:itemindex]; [menuTitle release]; [newItem release]; @@ -143,7 +194,12 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) wxMenu *wxMenuBar::Remove(size_t pos) { - return NULL; + wxMenu *menu = wxMenuBarBase::Remove(pos); + wxASSERT(menu); + int itemindex = [GetNSMenu() indexOfItemWithSubmenu:menu->GetNSMenu()]; + wxASSERT(itemindex>=0); + [m_cocoaNSMenu removeItemAtIndex:itemindex]; + return menu; } @@ -156,21 +212,26 @@ bool wxMenuBar::IsEnabledTop(size_t pos) const return false; } -void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) +void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label) { } -wxString wxMenuBar::GetLabelTop(size_t pos) const +wxString wxMenuBar::GetMenuLabel(size_t pos) const { - return wxEmptyString; + wxMenu *menu = GetMenu(pos); + int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:menu->GetNSMenu()]; + wxASSERT(itemindex>=0); + return wxStringWithNSString([[m_cocoaNSMenu itemAtIndex:itemindex] title]); } void wxMenuBar::Attach(wxFrame *frame) { + wxMenuBarBase::Attach(frame); } void wxMenuBar::Detach() { + wxMenuBarBase::Detach(); } wxSize wxMenuBar::DoGetBestClientSize() const