X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fc2d511d0f095ab5de3713cff6042832f886d15..a0b0865599239b35bbfb1fcb1d564c077f90eb66:/src/cocoa/menu.mm?ds=inline diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm index 57db00ae15..3c69ea7481 100644 --- a/src/cocoa/menu.mm +++ b/src/cocoa/menu.mm @@ -42,15 +42,14 @@ 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 = [[NSMenu alloc] initWithTitle: [NSString stringWithCString: title.c_str()]]; + return true; } wxMenu::~wxMenu() { + [m_cocoaNSMenu release]; } bool wxMenu::DoAppend(wxMenuItem *item) @@ -87,13 +86,20 @@ 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() { + [m_cocoaNSMenu release]; } bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) @@ -120,6 +126,8 @@ 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()); + // Get the current menu at this position + wxMenu *nextmenu = GetMenu(pos); if(!wxMenuBarBase::Insert(pos,menu,title)) return false; wxASSERT(menu); @@ -129,7 +137,9 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) [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 +153,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; } @@ -162,7 +177,10 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) wxString wxMenuBar::GetLabelTop(size_t pos) const { - return wxEmptyString; + wxMenu *menu = GetMenu(pos); + int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:menu->GetNSMenu()]; + wxASSERT(itemindex>=0); + return wxString([[[m_cocoaNSMenu itemAtIndex:itemindex] title] lossyCString]); } void wxMenuBar::Attach(wxFrame *frame)