Fix item selection/focus drawing in generic wxListCtrl.

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

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index e87f6b2aa65cb3fc7fb4f58b94d1d33536352234..1ddcbb4b614636dc771243d5e0291ee761b629a8 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -23,6 +23,8 @@
 
 #include "wx/menuitem.h"
 
 
 #include "wx/menuitem.h"
 

+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #ifndef WX_PRECOMP
     #include "wx/menu.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
     #include "wx/utils.h"


@@ -53,6 +55,7 @@
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget
 - (void)wxMenuItemAction: (id)sender;
 - (BOOL)validateMenuItem: (id)menuItem;
 @end //interface wxNSMenuItemTarget

+WX_DECLARE_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)

 
 @implementation wxNSMenuItemTarget : NSObject
 
 
 @implementation wxNSMenuItemTarget : NSObject
 


@@ -74,6 +77,7 @@
 }
 
 @end //implementation wxNSMenuItemTarget
 }
 
 @end //implementation wxNSMenuItemTarget

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)

 
 // ============================================================================
 // wxMenuItemCocoa implementation
 
 // ============================================================================
 // wxMenuItemCocoa implementation


@@ -81,7 +85,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
 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
 
 // ----------------------------------------------------------------------------
 // wxMenuItemBase


@@ -97,12 +101,6 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
     return new wxMenuItem(parentMenu, itemid, name, help, kind, subMenu);
 }
 
     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();
 void wxMenuItemCocoa::CocoaSetKeyEquivalent()
 {
     wxAcceleratorEntry *accel = GetAccel();


@@ -281,9 +279,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();
     wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have titles."));
     [m_cocoaNSMenuItem setTitle: wxNSStringWithWxString(wxStripMenuCodes(label))];
     CocoaSetKeyEquivalent();