X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f864c32c53356b7228591c85b14abc491c46f0..ec5006bdc630dd6b3d4cad1a3b572ab4c695a029:/src/mac/classic/menuitem.cpp

diff --git a/src/mac/classic/menuitem.cpp b/src/mac/classic/menuitem.cpp
index 321023913d..51a8a3ca5a 100644
--- a/src/mac/classic/menuitem.cpp
+++ b/src/mac/classic/menuitem.cpp
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.cpp
+// Name:        src/mac/classic/menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
@@ -13,9 +13,15 @@
 // headers & declarations
 // ============================================================================
 
-#include "wx/app.h"
-#include "wx/menu.h"
+#include "wx/wxprec.h"
+
 #include "wx/menuitem.h"
+#include "wx/stockitem.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/menu.h"
+#endif
 
 #include "wx/mac/uma.h"
 // ============================================================================
@@ -41,12 +47,12 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        const wxString& text,
                        const wxString& strHelp,
                        wxItemKind kind,
-                       wxMenu *pSubMenu) 
+                       wxMenu *pSubMenu)
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
 {
     // TO DISCUSS on dev : whether we can veto id 0
     // wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
-    
+
     // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
     // therefore these item must not be translated
     if ( wxStripMenuCodes(m_text).Upper() ==  wxT("EXIT") )
@@ -55,32 +61,32 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     }
 
     m_radioGroup.start = -1;
-    m_isRadioGroupStart = FALSE;
+    m_isRadioGroupStart = false;
 }
 
-wxMenuItem::~wxMenuItem() 
+wxMenuItem::~wxMenuItem()
 {
 }
 
 // change item state
 // -----------------
 
-void wxMenuItem::SetBitmap(const wxBitmap& bitmap) 
-{ 
-      m_bitmap = bitmap; 
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
+{
+      m_bitmap = bitmap;
       UpdateItemBitmap() ;
 }
 
-void wxMenuItem::UpdateItemBitmap() 
+void wxMenuItem::UpdateItemBitmap()
 {
     if ( !m_parentMenu )
         return ;
-        
+
     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
     if( mhandle == NULL || index == 0)
         return ;
-        
+
     if ( m_bitmap.Ok() )
     {
         ControlButtonContentInfo info ;
@@ -88,18 +94,18 @@ void wxMenuItem::UpdateItemBitmap()
         if ( info.contentType != kControlNoContent )
         {
             if ( info.contentType == kControlContentCIconHandle )
-                SetMenuItemIconHandle( mhandle , index , 
+                SetMenuItemIconHandle( mhandle , index ,
                     kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
         }
-            
+
     }
 }
 
-void wxMenuItem::UpdateItemStatus() 
+void wxMenuItem::UpdateItemStatus()
 {
     if ( !m_parentMenu )
         return ;
-        
+
 #if TARGET_CARBON
     if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macPreferencesMenuItemId)
     {
@@ -116,7 +122,7 @@ void wxMenuItem::UpdateItemStatus()
             EnableMenuCommand( NULL , kHICommandQuit ) ;
     }
 #endif
-    { 
+    {
         MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
         MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
         if( mhandle == NULL || index == 0)
@@ -128,25 +134,32 @@ void wxMenuItem::UpdateItemStatus()
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
-           UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; 
-           wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+           UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ;
+           wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
     }
 }
 
-void wxMenuItem::UpdateItemText() 
+void wxMenuItem::UpdateItemText()
 {
     if ( !m_parentMenu )
         return ;
-        
+
     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
     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 ;
 }
@@ -154,7 +167,7 @@ void wxMenuItem::UpdateItemText()
 
 void wxMenuItem::Enable(bool bDoEnable)
 {
-    if ( m_isEnabled != bDoEnable ) 
+    if ( m_isEnabled != bDoEnable )
     {
         wxMenuItemBase::Enable( bDoEnable ) ;
         UpdateItemStatus() ;
@@ -162,7 +175,7 @@ void wxMenuItem::Enable(bool bDoEnable)
 }
 void wxMenuItem::UncheckRadio()
 {
-    if ( m_isChecked ) 
+    if ( m_isChecked )
     {
         wxMenuItemBase::Check( false ) ;
         UpdateItemStatus() ;
@@ -173,7 +186,7 @@ void wxMenuItem::Check(bool bDoCheck)
 {
     wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
 
-    if ( m_isChecked != bDoCheck ) 
+    if ( m_isChecked != bDoCheck )
     {
         if ( GetKind() == wxITEM_RADIO )
         {
@@ -181,7 +194,7 @@ void wxMenuItem::Check(bool bDoCheck)
             {
                 wxMenuItemBase::Check( bDoCheck ) ;
                 UpdateItemStatus() ;
-                
+
                 // get the index of this item in the menu
                 const wxMenuItemList& items = m_parentMenu->GetMenuItems();
                 int pos = items.IndexOf(this);
@@ -232,7 +245,7 @@ void wxMenuItem::SetText(const wxString& text)
         return;
 
     wxMenuItemBase::SetText(text);
-    
+
     UpdateItemText() ;
 }
 
@@ -241,7 +254,7 @@ void wxMenuItem::SetText(const wxString& text)
 
 void wxMenuItem::SetAsRadioGroupStart()
 {
-    m_isRadioGroupStart = TRUE;
+    m_isRadioGroupStart = true;
 }
 
 void wxMenuItem::SetRadioGroupStart(int start)