wxMac GSocket C -> C++

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index b44993e3705f7cf43f26e7a4f09ba399c5eadd8f..f3c4f869eeed010e5f9a57d4b2c0bbad1a8aadb6 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -46,6 +46,9 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        wxMenu *pSubMenu) 
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, 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") )
     // 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") )


@@ -127,7 +130,7 @@ void wxMenuItem::UpdateItemStatus()
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 

-           UMASetMenuItemText( mhandle , index , m_text ) ; 
+           UMASetMenuItemText( mhandle , index , 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 ;


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

-       UMASetMenuItemText( mhandle , index , m_text ) ; 
+       UMASetMenuItemText( mhandle , index , 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 ;


@@ -205,7 +208,7 @@ void wxMenuItem::Check(bool bDoCheck)
                 }
 
                 // also uncheck all the other items in this radio group
                 }
 
                 // also uncheck all the other items in this radio group

-                wxMenuItemList::Node *node = items.Item(start);
+                wxMenuItemList::compatibility_iterator node = items.Item(start);

                 for ( int n = start; n <= end && node; n++ )
                 {
                     if ( n != pos )
                 for ( int n = start; n <= end && node; n++ )
                 {
                     if ( n != pos )