* Add a comment to Enable() indicating that it is properly implemented

* Implement SetText()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index 43c111f79c75e32d0ab48550bba2d91da47fb6bc..f035d27581104e4fcf7f8229c196a1ba2bedb024 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -169,6 +169,7 @@ wxMenuItem::~wxMenuItem()
 void wxMenuItem::Enable(bool bDoEnable)
 {
     wxMenuItemBase::Enable(bDoEnable);
 void wxMenuItem::Enable(bool bDoEnable)
 {
     wxMenuItemBase::Enable(bDoEnable);

+    // NOTE: Nothing to do, we respond to validateMenuItem instead

 }
 
 void wxMenuItem::Check(bool bDoCheck)
 }
 
 void wxMenuItem::Check(bool bDoCheck)


@@ -180,6 +181,8 @@ void wxMenuItem::Check(bool bDoCheck)
 void wxMenuItem::SetText(const wxString& label)
 {
     wxMenuItemBase::SetText(label);
 void wxMenuItem::SetText(const wxString& label)
 {
     wxMenuItemBase::SetText(label);

+    wxCHECK_RET(m_kind != wxITEM_SEPARATOR, wxT("Separator items do not have titles."));
+    [m_cocoaNSMenuItem setTitle: wxNSStringWithWxString(wxStripMenuCodes(label))];

 }
 
 void wxMenuItem::SetCheckable(bool checkable)
 }
 
 void wxMenuItem::SetCheckable(bool checkable)