X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/829a2e9521175cd943d671f16535242a467c4f91..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/cocoa/menu.mm?ds=inline diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm index 55e0f3035b..b02bb35b34 100644 --- a/src/cocoa/menu.mm +++ b/src/cocoa/menu.mm @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/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$ // Copyright: (c) 2002 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -41,12 +41,10 @@ // wxMenu implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) - bool wxMenu::Create(const wxString& title, long style) { wxAutoNSAutoreleasePool pool; - m_cocoaNSMenu = [[WXNSMenu alloc] initWithTitle: wxNSStringWithWxString(title)]; + m_cocoaNSMenu = [[WX_GET_OBJC_CLASS(WXNSMenu) alloc] initWithTitle: wxNSStringWithWxString(title)]; AssociateNSMenu(m_cocoaNSMenu); return true; } @@ -115,7 +113,6 @@ void wxMenu::Cocoa_dealloc() // ============================================================================ // wxMenuBar implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow) bool wxMenuBar::Create(long style) { @@ -215,11 +212,11 @@ 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 { wxMenu *menu = GetMenu(pos); int itemindex = [m_cocoaNSMenu indexOfItemWithSubmenu:menu->GetNSMenu()];