Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing...

[wxWidgets.git] / src / cocoa / menu.mm

diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm
index 27cc125141c11b41016a05e2d254cea5fb7411d5..4ec58599934388a839ef2e9572c137aa8416a5d2 100644 (file)
--- a/src/cocoa/menu.mm
+++ b/src/cocoa/menu.mm
@@ -29,7 +29,7 @@
 #include "wx/cocoa/string.h"
 
 #import <Foundation/NSString.h>
-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"
 
 #if wxUSE_MENUS
 
@@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 bool wxMenu::Create(const wxString& title, long style)
 {
     wxAutoNSAutoreleasePool pool;
-    m_cocoaNSMenu = [[NSMenu alloc] initWithTitle: wxNSStringWithWxString(title)];
+    m_cocoaNSMenu = [[WX_GET_OBJC_CLASS(WXNSMenu) alloc] initWithTitle: wxNSStringWithWxString(title)];
     AssociateNSMenu(m_cocoaNSMenu);
     return true;
 }
@@ -215,11 +215,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()];