allowing ampersands in choices and comboboxes means we have to strip outside of uma.cpp

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

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index b65b04b6fcf28575455dbbf628898c9d70b7f532..a5bf7019b13b6d2412bd49e648b123a2084c7426 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -176,9 +176,9 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                 pSubMenu->MacBeforeDisplay( true ) ;
 
             if ( pos == (size_t)-1 )
                 pSubMenu->MacBeforeDisplay( true ) ;
 
             if ( pos == (size_t)-1 )

-                UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding(), pSubMenu->m_macMenuId);
+                UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), wxStripMenuCodes(pItem->GetText()), wxFont::GetDefaultEncoding(), pSubMenu->m_macMenuId);

             else
             else

-                UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding(), pos, pSubMenu->m_macMenuId);
+                UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), wxStripMenuCodes(pItem->GetText()), wxFont::GetDefaultEncoding(), pos, pSubMenu->m_macMenuId);

 
             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;
 
             pItem->UpdateItemBitmap() ;
             pItem->UpdateItemStatus() ;


@@ -705,7 +705,7 @@ void wxMenuBar::MacInstallMenuBar()
                         {
                             if ( mh )
                             {
                         {
                             if ( mh )
                             {

-                                UMAAppendMenuItem(mh, item->GetText() , wxFont::GetDefaultEncoding(), entry);
+                                UMAAppendMenuItem(mh, wxStripMenuCodes(item->GetText()) , wxFont::GetDefaultEncoding(), entry);

                                 SetMenuItemCommandID( mh , CountMenuItems(mh) , wxIdToMacCommand ( item->GetId() ) ) ;
                                 SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ;
                             }
                                 SetMenuItemCommandID( mh , CountMenuItems(mh) , wxIdToMacCommand ( item->GetId() ) ) ;
                                 SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ;
                             }


@@ -731,7 +731,7 @@ void wxMenuBar::MacInstallMenuBar()
         if ( aboutMenuItem )
         {
             wxAcceleratorEntry* entry = wxGetAccelFromString( aboutMenuItem->GetText() ) ;
         if ( aboutMenuItem )
         {
             wxAcceleratorEntry* entry = wxGetAccelFromString( aboutMenuItem->GetText() ) ;

-            UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , aboutMenuItem->GetText() , wxFont::GetDefaultEncoding() );
+            UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , wxStripMenuCodes ( aboutMenuItem->GetText() ) , wxFont::GetDefaultEncoding() );

             UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
             SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , kHICommandAbout ) ;
             SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)aboutMenuItem ) ;
             UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
             SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , kHICommandAbout ) ;
             SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)aboutMenuItem ) ;

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index c7f580c0cb9f5b8fa70278bf5025de0aaac22fe2..e896a86c075d0a441046eee4b4d41a7886c7bc4d 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -136,7 +136,7 @@ void wxMenuItem::UpdateItemStatus()
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 

-        UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ;
+        UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;

         wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
         wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;


@@ -153,7 +153,7 @@ void wxMenuItem::UpdateItemText()
     if( mhandle == NULL || index == 0)
         return ;
 
     if( mhandle == NULL || index == 0)
         return ;
 

-    UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ;
+    UMASetMenuItemText( mhandle , index , wxStripMenuCodes(m_text) , wxFont::GetDefaultEncoding() ) ;

     wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;
     wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index e5fc628fead1d2c0e00230ae70a541b48d212fd3..23205472bac0f99051079c0667b66d92acdcdaa9 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -242,7 +242,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco
 
 void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )
 {
 
 void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )
 {

-    wxString str = wxStripMenuCodes( title ) ;
+    wxString str = title ; // we don't strip the accels here anynmore, must be done before

 
 #if TARGET_CARBON
     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
 
 #if TARGET_CARBON
     SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;