X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25466131acbbca2186d01fb852d61f50ba968fb4..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/cocoa/menuitem.mm diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm index 140e2ead44..b5d1daa220 100644 --- a/src/cocoa/menuitem.mm +++ b/src/cocoa/menuitem.mm @@ -23,6 +23,8 @@ #include "wx/menuitem.h" +#include "wx/cocoa/objc/objc_uniquifying.h" + #ifndef WX_PRECOMP #include "wx/menu.h" #include "wx/utils.h" @@ -30,7 +32,6 @@ #include "wx/log.h" #endif -#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" @@ -54,6 +55,7 @@ - (void)wxMenuItemAction: (id)sender; - (BOOL)validateMenuItem: (id)menuItem; @end //interface wxNSMenuItemTarget +WX_DECLARE_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject) @implementation wxNSMenuItemTarget : NSObject @@ -75,14 +77,14 @@ } @end //implementation wxNSMenuItemTarget +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject) // ============================================================================ // wxMenuItemCocoa implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash; -wxObjcAutoRefFromAlloc wxMenuItemCocoa::sm_cocoaTarget = [[wxNSMenuItemTarget alloc] init]; +wxObjcAutoRefFromAlloc wxMenuItemCocoa::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init]; // ---------------------------------------------------------------------------- // wxMenuItemBase @@ -98,12 +100,6 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, return new wxMenuItem(parentMenu, itemid, name, help, kind, subMenu); } -/* static */ -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) -{ - return wxStripMenuCodes(text); -} - void wxMenuItemCocoa::CocoaSetKeyEquivalent() { wxAcceleratorEntry *accel = GetAccel(); @@ -229,7 +225,7 @@ void wxMenuItem::SetBitmaps(const wxBitmap& bmpChecked, } else { - wxASSERT_MSG(!bmpUnchecked.Ok(),wxT("Normal menu items should only have one bitmap")); + wxASSERT_MSG(!bmpUnchecked.IsOk(),wxT("Normal menu items should only have one bitmap")); [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)]; } } @@ -282,9 +278,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();