Final fix for Bug #1472688 'wxString::Trim() is broken'

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 5188955ad40e091e2a1ffbdb049dd66eec554a04..7929831fb4d96c9948b12843815421704ebc95aa 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -1,89 +1,70 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/mac/carbon/menuitem.cpp

 // Purpose:     wxMenuItem implementation
 // Author:      Stefan Csomor
 // Purpose:     wxMenuItem implementation
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/app.h"
-#include "wx/menu.h"

 #include "wx/menuitem.h"
 
 #include "wx/menuitem.h"
 

-#include "wx/mac/uma.h"
-// ============================================================================
-// implementation
-// ============================================================================
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/menu.h"
+#endif // WX_PRECOMP

 
 

-// ----------------------------------------------------------------------------
-// dynamic classes implementation
-// ----------------------------------------------------------------------------
-
-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-#endif  //USE_SHARED_LIBRARY
+#include "wx/mac/uma.h"

 
 

-// ----------------------------------------------------------------------------
-// wxMenuItem
-// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

 
 

-//
-// ctor & dtor
-// -----------

 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        int id,
                        const wxString& text,
                        const wxString& strHelp,
                        wxItemKind kind,
 
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        int id,
                        const wxString& text,
                        const wxString& strHelp,
                        wxItemKind kind,

-                       wxMenu *pSubMenu) 
-          : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
+                       wxMenu *pSubMenu)
+           :wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)

 {
     wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
 {
     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
     // 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") )
-    {
-        m_text =wxT("Quit\tCtrl+Q") ;
-    }
+    if ( wxStripMenuCodes(m_text).Upper() == wxT("EXIT") )
+        m_text = wxT("Quit\tCtrl+Q") ;

 
     m_radioGroup.start = -1;
 
     m_radioGroup.start = -1;

-    m_isRadioGroupStart = FALSE;
+    m_isRadioGroupStart = false;

 }
 
 }
 

-wxMenuItem::~wxMenuItem() 
+wxMenuItem::~wxMenuItem()

 {
 }
 
 // change item state
 // -----------------
 
 {
 }
 
 // change item state
 // -----------------
 

-void wxMenuItem::SetBitmap(const wxBitmap& bitmap) 
-{ 
-      m_bitmap = bitmap; 
-      UpdateItemBitmap() ;
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
+{
+      m_bitmap = bitmap;
+      UpdateItemBitmap();

 }
 
 }
 

-void wxMenuItem::UpdateItemBitmap() 
+void wxMenuItem::UpdateItemBitmap()

 {
     if ( !m_parentMenu )
         return ;
 {
     if ( !m_parentMenu )
         return ;

-        
+

     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;

-    if( mhandle == NULL || index == 0)
+    if ( mhandle == NULL || index == 0)

         return ;
         return ;

-        
+

     if ( m_bitmap.Ok() )
     {
 #if wxUSE_BMPBUTTON
     if ( m_bitmap.Ok() )
     {
 #if wxUSE_BMPBUTTON


@@ -92,19 +73,22 @@ void wxMenuItem::UpdateItemBitmap()
         if ( info.contentType != kControlNoContent )
         {
             if ( info.contentType == kControlContentIconRef )
         if ( info.contentType != kControlNoContent )
         {
             if ( info.contentType == kControlContentIconRef )

-                SetMenuItemIconHandle( mhandle , index , 
+                SetMenuItemIconHandle( mhandle , index ,

                     kMenuIconRefType , (Handle) info.u.iconRef ) ;
         }
         wxMacReleaseBitmapButton( &info ) ;
                     kMenuIconRefType , (Handle) info.u.iconRef ) ;
         }
         wxMacReleaseBitmapButton( &info ) ;

-#endif            
+#endif

     }
 }
 
     }
 }
 

-void wxMenuItem::UpdateItemStatus() 
+void wxMenuItem::UpdateItemStatus()

 {
     if ( !m_parentMenu )
         return ;
 {
     if ( !m_parentMenu )
         return ;

-        
+
+    if ( IsSeparator() )
+        return ;
+

 #if TARGET_CARBON
     if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macPreferencesMenuItemId)
     {
 #if TARGET_CARBON
     if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macPreferencesMenuItemId)
     {


@@ -113,6 +97,7 @@ void wxMenuItem::UpdateItemStatus()
         else
             EnableMenuCommand( NULL , kHICommandPreferences ) ;
     }
         else
             EnableMenuCommand( NULL , kHICommandPreferences ) ;
     }

+

     if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macExitMenuItemId)
     {
         if ( !IsEnabled() )
     if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macExitMenuItemId)
     {
         if ( !IsEnabled() )


@@ -121,42 +106,42 @@ void wxMenuItem::UpdateItemStatus()
             EnableMenuCommand( NULL , kHICommandQuit ) ;
     }
 #endif
             EnableMenuCommand( NULL , kHICommandQuit ) ;
     }
 #endif

-    { 
+
+    {

         MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
         MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
         MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
         MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;

-        if( mhandle == NULL || index == 0)
+        if ( mhandle == NULL || index == 0)

             return ;
 
             return ;
 

-          UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
-          if ( IsCheckable() && IsChecked() )
+        UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+        if ( IsCheckable() && IsChecked() )

             ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
             ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 

-           UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; 
-           wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+        UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;
+        wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;

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

-void wxMenuItem::UpdateItemText() 
+void wxMenuItem::UpdateItemText()

 {
     if ( !m_parentMenu )
         return ;
 {
     if ( !m_parentMenu )
         return ;

-        
+

     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
     MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
     MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;

-    if( mhandle == NULL || index == 0)
+    if (mhandle == NULL || index == 0)

         return ;
 
         return ;
 

-       UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; 
-       wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+    UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;
+    wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;

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

-

 void wxMenuItem::Enable(bool bDoEnable)
 {
     if (( m_isEnabled != bDoEnable
 void wxMenuItem::Enable(bool bDoEnable)
 {
     if (( m_isEnabled != bDoEnable


@@ -176,9 +161,10 @@ void wxMenuItem::Enable(bool bDoEnable)
         UpdateItemStatus() ;
     }
 }
         UpdateItemStatus() ;
     }
 }

+

 void wxMenuItem::UncheckRadio()
 {
 void wxMenuItem::UncheckRadio()
 {

-    if ( m_isChecked ) 
+    if ( m_isChecked )

     {
         wxMenuItemBase::Check( false ) ;
         UpdateItemStatus() ;
     {
         wxMenuItemBase::Check( false ) ;
         UpdateItemStatus() ;


@@ -187,9 +173,9 @@ void wxMenuItem::UncheckRadio()
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
+    wxCHECK_RET( IsCheckable() && !IsSeparator(), wxT("only checkable items may be checked") );

 
 

-    if ( m_isChecked != bDoCheck ) 
+    if ( m_isChecked != bDoCheck )

     {
         if ( GetKind() == wxITEM_RADIO )
         {
     {
         if ( GetKind() == wxITEM_RADIO )
         {


@@ -197,7 +183,7 @@ void wxMenuItem::Check(bool bDoCheck)
             {
                 wxMenuItemBase::Check( bDoCheck ) ;
                 UpdateItemStatus() ;
             {
                 wxMenuItemBase::Check( bDoCheck ) ;
                 UpdateItemStatus() ;

-                
+

                 // get the index of this item in the menu
                 const wxMenuItemList& items = m_parentMenu->GetMenuItems();
                 int pos = items.IndexOf(this);
                 // get the index of this item in the menu
                 const wxMenuItemList& items = m_parentMenu->GetMenuItems();
                 int pos = items.IndexOf(this);


@@ -205,8 +191,7 @@ void wxMenuItem::Check(bool bDoCheck)
                              _T("menuitem not found in the menu items list?") );
 
                 // get the radio group range
                              _T("menuitem not found in the menu items list?") );
 
                 // get the radio group range

-                int start,
-                    end;
+                int start, end;

 
                 if ( m_isRadioGroupStart )
                 {
 
                 if ( m_isRadioGroupStart )
                 {


@@ -226,9 +211,8 @@ void wxMenuItem::Check(bool bDoCheck)
                 for ( int n = start; n <= end && node; n++ )
                 {
                     if ( n != pos )
                 for ( int n = start; n <= end && node; n++ )
                 {
                     if ( n != pos )

-                    {

                         ((wxMenuItem*)node->GetData())->UncheckRadio();
                         ((wxMenuItem*)node->GetData())->UncheckRadio();

-                    }
+

                     node = node->GetNext();
                 }
             }
                     node = node->GetNext();
                 }
             }


@@ -248,7 +232,7 @@ void wxMenuItem::SetText(const wxString& text)
         return;
 
     wxMenuItemBase::SetText(text);
         return;
 
     wxMenuItemBase::SetText(text);

-    
+

     UpdateItemText() ;
 }
 
     UpdateItemText() ;
 }
 


@@ -257,13 +241,13 @@ void wxMenuItem::SetText(const wxString& text)
 
 void wxMenuItem::SetAsRadioGroupStart()
 {
 
 void wxMenuItem::SetAsRadioGroupStart()
 {

-    m_isRadioGroupStart = TRUE;
+    m_isRadioGroupStart = true;

 }
 
 void wxMenuItem::SetRadioGroupStart(int start)
 {
     wxASSERT_MSG( !m_isRadioGroupStart,
 }
 
 void wxMenuItem::SetRadioGroupStart(int start)
 {
     wxASSERT_MSG( !m_isRadioGroupStart,

-                  _T("should only be called for the next radio items") );
+                  wxT("should only be called for the next radio items") );

 
     m_radioGroup.start = start;
 }
 
     m_radioGroup.start = start;
 }


@@ -271,7 +255,7 @@ void wxMenuItem::SetRadioGroupStart(int start)
 void wxMenuItem::SetRadioGroupEnd(int end)
 {
     wxASSERT_MSG( m_isRadioGroupStart,
 void wxMenuItem::SetRadioGroupEnd(int end)
 {
     wxASSERT_MSG( m_isRadioGroupStart,

-                  _T("should only be called for the first radio item") );
+                  wxT("should only be called for the first radio item") );

 
     m_radioGroup.end = end;
 }
 
     m_radioGroup.end = end;
 }