Added SetToolNormalBitmap and SetToolDisabledBitmap

[wxWidgets.git] / src / mac / carbon / menuitem.cpp

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 7929831fb4d96c9948b12843815421704ebc95aa..7d6dc48db145f7b975843372a59c170418ac2c0e 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -12,6 +12,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/menuitem.h"
+#include "wx/stockitem.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -120,7 +121,7 @@ void wxMenuItem::UpdateItemStatus()
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
         UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;
-        wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+        wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
     }
@@ -136,8 +137,15 @@ void wxMenuItem::UpdateItemText()
     if (mhandle == NULL || index == 0)
         return ;
 
-    UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;
-    wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+    wxString text = m_text;
+    if (text.IsEmpty() && !IsSeparator())
+    {
+        wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
+        text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
+    }
+
+    UMASetMenuItemText( mhandle , index , wxStripMenuCodes(text) , wxFont::GetDefaultEncoding() ) ;
+    wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( text ) ;
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;
 }