Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 153c750c4476b660df8e9d4026eb57b286702cde..eedc3b0a0f22eb91392c973ed5bea0d8aee5cae6 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -13,10 +13,11 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

+#include "wx/app.h"

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

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -34,271 +35,175 @@
 // ----------------------------------------------------------------------------
 
 //
 // ----------------------------------------------------------------------------
 
 //

-// Helper Functions to get Mac Menus the way they should be ;-)
-//
-
-void wxMacCtoPString(const char* theCString, Str255 thePString);
-
-// remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
-
-wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )
-{
-       char *p = (char *) &outMacItemText[1] ;
-       short macModifiers = 0 ;
-       char macShortCut = 0 ;
-       const char *inItemName ;
-       wxString inItemTextMac ;
-       
-       if (wxApp::s_macDefaultEncodingIsPC)
-       {
-               inItemTextMac =  wxMacMakeMacStringFromPC( inItemText ) ;
-               inItemName = inItemTextMac ;
-       }
-       else
-       {
-               inItemName = inItemText ;
-       }
-       
-       if ( useShortcuts && !wxApp::s_macSupportPCMenuShortcuts )
-               useShortcuts = false ;
-       
-       // we have problems with a leading hypen - it will be taken as a separator
-       
-       while ( *inItemName == '-' )
-               inItemName++ ;
-               
-       while( *inItemName )
-       {
-               switch ( *inItemName )
-               {
-                       // special characters for macintosh menus -> use some replacement
-                       case ';' :
-                               *p++ = ',' ;
-                               break ;
-                       case '^' :
-                               *p++ = ' ' ;
-                               break ;
-                       case '!' :
-                               *p++ = ' ' ;
-                               break ;
-                       case '<' :
-                               *p++ = '[' ;
-                               break ;
-                       case '>' :
-                               *p++ = ']' ;
-                               break ;
-                       case '/' :
-                               *p++ = '|' ;
-                               break ;
-                       case '(' :
-                               *p++ = '[' ;
-                               break ;
-                       case ')' :      
-                               *p++ = ']' ;
-                               break ;
-                       // shortcuts
-                       case '&' :
-                               {
-                                       ++inItemName ;
-                                       if ( *inItemName )
-                                       {
-                                               *p++ = *inItemName ;
-                                               if ( useShortcuts )
-                                                       macShortCut = *inItemName ;
-                                       }
-                                       else
-                                               --inItemName ;
-                               }
-                               break ;
-                       // win-like accelerators
-                       case '\t' :
-                               {
-                                       ++inItemName ;
-                                       while( *inItemName )
-                                       {
-                                               if (strncmp("Ctrl", inItemName, 4) == 0) 
-                                               {
-                                                       inItemName = inItemName + 5;
-                                                       macShortCut = *inItemName;
-                                               }
-                                               else if (strncmp("Cntrl", inItemName, 5) == 0) 
-                                               {
-                                                       inItemName = inItemName + 6;
-                                                       macShortCut = *inItemName;
-                                               }
-                                               else if (strncmp("Alt", inItemName, 3) == 0) 
-                                               {
-                                                       inItemName = inItemName + 4;
-                                                       macModifiers |= kMenuOptionModifier ;
-                                                       macShortCut = *inItemName ;
-                                               }
-                                               else if (strncmp("Shift", inItemName, 5) == 0) 
-                                               {
-                                                       inItemName = inItemName + 6;
-                                                       macModifiers |= kMenuShiftModifier ;
-                                                       macShortCut = *inItemName ;
-                                               }
-                                               else if (strncmp("F", inItemName, 1) == 0) 
-                                               {
-                                                       inItemName += strlen( inItemName ) ;
-                                                       // no function keys at the moment
-                                                       // macModifiers |= kMenuShiftModifier ;
-                                                       // macShortCut = *inItemName ;
-                                               }
-                                               else
-                                               {
-                                                       break ;
-                                               }
-                                       }
-
-                                       if ( *inItemName == 0 )
-                                               --inItemName ;
-                                               
-                               }
-                               break ;
-                       default :
-                               *p++ = *inItemName ;
-               }
-               ++inItemName ;
-       }
-
-       outMacItemText[0] = (p - (char *)outMacItemText) - 1;
-       if ( outMacShortcutChar )
-               *outMacShortcutChar = macShortCut ;
-       if ( outMacModifiers )
-               *outMacModifiers = macModifiers ;
-               
-       return 0 ;
-}
-

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

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

                        wxMenu *pSubMenu) 
                        wxMenu *pSubMenu) 

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

 {
 {

-    wxASSERT( pParentMenu != NULL );
-
-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_id          = id;
-    m_text        = text;
-    m_isCheckable = bCheckable;
-    m_help        = strHelp;
-
-
-    if ( m_text ==  "E&xit"  ||m_text == "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() ==  "EXIT" )

     {
         m_text = "Quit\tCtrl+Q" ;
     }
     {
         m_text = "Quit\tCtrl+Q" ;
     }

+
+    m_radioGroup.start = -1;
+    m_isRadioGroupStart = FALSE;

 }
 
 wxMenuItem::~wxMenuItem() 
 {
 }
 
 }
 
 wxMenuItem::~wxMenuItem() 
 {
 }
 

-bool wxMenuItem::IsChecked() const
-{
-    return wxMenuItemBase::IsChecked() ;
-}
+// change item state
+// -----------------

 
 

-wxString wxMenuItem::GetLabel() const
-{
-    return wxStripMenuCodes(m_text);
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap) 
+{ 
+       m_bitmap = bitmap; 
+       UpdateItemBitmap() ;

 }
 
 }
 

-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::UpdateItemBitmap() 

 {
 {

-    return wxGetAccelFromString(GetText());
+       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 ;
+               wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+               if ( info.contentType != kControlNoContent )
+               {
+                       if ( info.contentType == kControlContentCIconHandle )
+                               SetMenuItemIconHandle( mhandle , index , 
+                                       kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+           }
+                       
+       }

 }
 
 }
 

-#endif // wxUSE_ACCEL
-
-// misc
-// ----
-
-/*
-
-// delete the sub menu
-void wxMenuItem::DeleteSubMenu()
+void wxMenuItem::UpdateItemStatus() 

 {
 {

-  wxASSERT( m_subMenu != NULL );
+       if ( !m_parentMenu )
+               return ;
+               
+       MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ;
+       MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ;
+       if( mhandle == NULL || index == 0)
+               return ;
+
+       UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+       if ( IsCheckable() && IsChecked() )
+               ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
+       else
+               ::SetItemMark( mhandle , index , 0 ) ; // no mark

 
 

-  delete m_subMenu;
-  m_subMenu = NULL;
+       UMASetMenuItemText( mhandle , index , m_text ) ; 
+       wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+       UMASetMenuItemShortcut( mhandle , index , entry ) ;
+       delete entry ;

 }
 
 }
 

-*/
+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 ) ; 
+       wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
+       UMASetMenuItemShortcut( mhandle , index , entry ) ;
+       delete entry ;
+}

 
 

-// change item state
-// -----------------

 
 void wxMenuItem::Enable(bool bDoEnable)
 {
 
 void wxMenuItem::Enable(bool bDoEnable)
 {

-  if ( m_isEnabled != bDoEnable ) {
-    if ( m_subMenu == NULL ) 
-    {     
-       // normal menu item
-           if ( m_parentMenu->GetHMenu() )
-           {
-                       int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-                       if ( index >= 1 )
-                       {
-                               if ( bDoEnable )
-                                       UMAEnableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                               else
-                                       UMADisableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                       }
-           }
-    }
-    else                            
-    {
-               // submenu
-           if ( m_parentMenu->GetHMenu() )
-           {
-                       int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-                       if ( index >= 1 )
-                       {
-                               if ( bDoEnable )
-                                       UMAEnableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                               else
-                                       UMADisableMenuItem( m_parentMenu->GetHMenu() , index ) ;
-                       }
-           }
-    }
-
-    m_isEnabled = bDoEnable;
-  }
+       if ( m_isEnabled != bDoEnable ) 
+       {
+               wxMenuItemBase::Enable( bDoEnable ) ;
+               UpdateItemStatus() ;
+       }
+}
+void wxMenuItem::UncheckRadio()
+{
+       if ( m_isChecked ) 
+       {
+               wxMenuItemBase::Check( false ) ;
+               UpdateItemStatus() ;
+       }

 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-  wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+       wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );

 
 

-  if ( m_isChecked != bDoCheck ) 
-  {
-    m_isChecked = bDoCheck;
-       if ( m_parentMenu->GetHMenu() )
-    {
-               int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-               if ( index >= 1 )
-               {
-                       if ( bDoCheck )
-                                       ::SetItemMark( m_parentMenu->GetHMenu() , index , 0x12 ) ; // checkmark
-                               else
-                                       ::SetItemMark( m_parentMenu->GetHMenu() , index , 0 ) ; // no mark
-               }
-       }
-  }
+       if ( m_isChecked != bDoCheck ) 
+       {
+               if ( GetKind() == wxITEM_RADIO )
+               {
+                       if ( 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);
+                       wxCHECK_RET( pos != wxNOT_FOUND,
+                                    _T("menuitem not found in the menu items list?") );
+
+                       // get the radio group range
+                       int start,
+                           end;
+
+                       if ( m_isRadioGroupStart )
+                       {
+                           // we already have all information we need
+                           start = pos;
+                           end = m_radioGroup.end;
+                       }
+                       else // next radio group item
+                       {
+                           // get the radio group end from the start item
+                           start = m_radioGroup.start;
+                           end = items.Item(start)->GetData()->m_radioGroup.end;
+                       }
+
+                       // also uncheck all the other items in this radio group
+                       wxMenuItemList::Node *node = items.Item(start);
+                       for ( int n = start; n <= end && node; n++ )
+                       {
+                           if ( n != pos )
+                           {
+                               ((wxMenuItem*)node->GetData())->UncheckRadio();
+                           }
+                           node = node->GetNext();
+                       }
+                       }
+               }
+               else
+               {
+                       wxMenuItemBase::Check( bDoCheck ) ;
+                       UpdateItemStatus() ;
+               }
+       }

 }
 
 void wxMenuItem::SetText(const wxString& text)
 }
 
 void wxMenuItem::SetText(const wxString& text)


@@ -308,29 +213,32 @@ void wxMenuItem::SetText(const wxString& text)
         return;
 
     wxMenuItemBase::SetText(text);
         return;
 
     wxMenuItemBase::SetText(text);

-//    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+    
+    UpdateItemText() ;
+}

 
 

-    wxCHECK_RET( m_parentMenu && m_parentMenu->GetHMenu(), wxT("menuitem without menu") );
-       if ( m_parentMenu->GetHMenu() )
-    {
-               int index = m_parentMenu->MacGetIndexFromItem( this ) ;
-               if ( index >= 1 )
-               {
-                       Str255 label;
-                       MacBuildMenuString( label , NULL , NULL , text ,false);
-                       UMASetMenuItemText( m_parentMenu->GetHMenu() , index , label ) ; // checkmark
-               }
-       }
-
-#if wxUSE_ACCEL
-    m_parentMenu->UpdateAccel(this);
-#endif // wxUSE_ACCEL
+// radio group stuff
+// -----------------

 
 

+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_isRadioGroupStart = TRUE;

 }
 }

-void wxMenuItem::SetCheckable(bool checkable)
+
+void wxMenuItem::SetRadioGroupStart(int start)

 {
 {

-    wxMenuItemBase::SetCheckable(checkable);
-   // OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+    wxASSERT_MSG( !m_isRadioGroupStart,
+                  _T("should only be called for the next radio items") );
+
+    m_radioGroup.start = start;
+}
+
+void wxMenuItem::SetRadioGroupEnd(int end)
+{
+    wxASSERT_MSG( m_isRadioGroupStart,
+                  _T("should only be called for the first radio item") );
+
+    m_radioGroup.end = end;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -347,8 +255,8 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,

-                                bool isCheckable,
+                                wxItemKind kind,

                                 wxMenu *subMenu)
 {
                                 wxMenu *subMenu)
 {

-    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);

 }
 }