X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0c0a393c4027a46b83187ea1328949ca75971d0..993da3969b28e4f80b492cc26114fb0e151163cb:/src/cocoa/menu.mm diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm index ae88841c86..2d662e4111 100644 --- a/src/cocoa/menu.mm +++ b/src/cocoa/menu.mm @@ -53,22 +53,22 @@ wxMenu::~wxMenu() [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) @@ -106,7 +106,7 @@ wxMenuBar::~wxMenuBar() bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) { wxAutoNSAutoreleasePool pool; - wxLogDebug(wxT("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); @@ -126,7 +126,7 @@ bool wxMenuBar::Append( wxMenu *menu, const wxString &title ) bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { wxAutoNSAutoreleasePool pool; - wxLogDebug(wxT("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))