X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e85b547a56a9346c2bdd690b2885ab2ef520c2b..0962839d231c7ae1250337c9a22c1384dd0285ea:/src/cocoa/menuitem.mm

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index c1248355e8..d6f542e13c 100644
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/cocoa/menuitem.mm
 // Purpose:     wxMenuItem implementation
 // Author:      David Elliott
 // Modified by:
@@ -18,15 +18,20 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/wxprec.h"
+
+#if wxUSE_MENUS
+
+#include "wx/menuitem.h"
+
+#include "wx/cocoa/objc/objc_uniquifying.h"
+
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
-    #include "wx/menuitem.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
@@ -36,8 +41,6 @@
 #import <AppKit/NSCell.h> // NSOnState, NSOffState
 #import <AppKit/NSEvent.h> // modifier key masks
 
-#if wxUSE_MENUS
-
 // ----------------------------------------------------------------------------
 // functions prototypes
 // ----------------------------------------------------------------------------
@@ -52,6 +55,7 @@
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)
 
 @implementation wxNSMenuItemTarget : NSObject
 
@@ -73,6 +77,7 @@
 }
 
 @end //implementation wxNSMenuItemTarget
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)
 
 // ============================================================================
 // wxMenuItemCocoa implementation
@@ -80,7 +85,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
-wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[wxNSMenuItemTarget alloc] init];
+wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init];
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
@@ -97,7 +102,7 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
 }
 
 /* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     return wxStripMenuCodes(text);
 }
@@ -280,9 +285,9 @@ void wxMenuItem::Check(bool check)
     }
 }
 
-void wxMenuItem::SetText(const wxString& label)
+void wxMenuItem::SetItemLabel(const wxString& label)
 {
-    wxMenuItemBase::SetText(label);
+    wxMenuItemBase::SetItemLabel(label);
     wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have titles."));
     [m_cocoaNSMenuItem setTitle: wxNSStringWithWxString(wxStripMenuCodes(label))];
     CocoaSetKeyEquivalent();