Unicode compilation fixes

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

diff --git a/src/mac/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp
index 615f4c0c29b367675cf859c8033f9aa1864c40ac..51a8a3ca5ab844a2695a6e235eb1bfd222e4aa03 100644 (file)
--- a/src/mac/classic/menuitem.cpp
+++ b/src/mac/classic/menuitem.cpp
@@ -16,6 +16,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/menuitem.h"
 #include "wx/wxprec.h"
 
 #include "wx/menuitem.h"

+#include "wx/stockitem.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -134,7 +135,7 @@ void wxMenuItem::UpdateItemStatus()
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
            UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ;
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
            UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ;

-           wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+           wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;

         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
     }
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
     }


@@ -150,8 +151,15 @@ void wxMenuItem::UpdateItemText()
     if( mhandle == NULL || index == 0)
         return ;
 
     if( mhandle == NULL || index == 0)
         return ;
 

-    UMASetMenuItemText( mhandle , index , 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 , text , wxFont::GetDefaultEncoding() ) ;
+    wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( text ) ;

     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;
 }
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;
 }