MSVC 5 does not have BIF_EDITBOX.

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

diff --git a/src/mac/menuitem.cpp b/src/mac/menuitem.cpp
index ef67483ca3d139c126062f37b38a3c97a69ec18c..eedc3b0a0f22eb91392c973ed5bea0d8aee5cae6 100644 (file)
--- a/src/mac/menuitem.cpp
+++ b/src/mac/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
 // ============================================================================


@@ -33,110 +34,229 @@
 // wxMenuItem
 // ----------------------------------------------------------------------------
 
 // wxMenuItem
 // ----------------------------------------------------------------------------
 

+//

 // 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() 
 {
 }
 

-// misc
-// ----
+// change item state
+// -----------------
+
+void wxMenuItem::SetBitmap(const wxBitmap& bitmap) 
+{ 
+       m_bitmap = bitmap; 
+       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 ;
+               wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+               if ( info.contentType != kControlNoContent )
+               {
+                       if ( info.contentType == kControlContentCIconHandle )
+                               SetMenuItemIconHandle( mhandle , index , 
+                                       kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+           }
+                       
+       }
+}

 
 

-// 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 ;

 
 

-  delete m_subMenu;
-  m_subMenu = NULL;
+       UMAEnableMenuItem( mhandle , index , m_isEnabled ) ;
+       if ( IsCheckable() && IsChecked() )
+               ::SetItemMark( mhandle , index , 0x12 ) ; // checkmark
+       else
+               ::SetItemMark( mhandle , index , 0 ) ; // no mark
+
+       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
-               }
-       }
-  }
-}
\ No newline at end of file
+       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)
+{
+    // don't do anything if label didn't change
+    if ( m_text == text )
+        return;
+
+    wxMenuItemBase::SetText(text);
+    
+    UpdateItemText() ;
+}
+
+// radio group stuff
+// -----------------
+
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_isRadioGroupStart = TRUE;
+}
+
+void wxMenuItem::SetRadioGroupStart(int start)
+{
+    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;
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------
+
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                wxItemKind kind,
+                                wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
+}