X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..76e36d433484b94cb5b7c3668fbce85ceebe508c:/src/mac/carbon/menuitem.cpp diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index 6cc3aa1a79..c7f580c0cb 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -2,7 +2,7 @@ // Name: menuitem.cpp // Purpose: wxMenuItem implementation // Author: Stefan Csomor -// Modified by: +// Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor @@ -13,6 +13,8 @@ // headers & declarations // ============================================================================ +#include "wx/wxprec.h" + #include "wx/app.h" #include "wx/menu.h" #include "wx/menuitem.h" @@ -26,9 +28,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) // ---------------------------------------------------------------------------- // wxMenuItem @@ -43,12 +43,11 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, 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) { - // 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") ) ; - + 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") ) @@ -57,51 +56,56 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, } m_radioGroup.start = -1; - m_isRadioGroupStart = FALSE; + m_isRadioGroupStart = false; } -wxMenuItem::~wxMenuItem() +wxMenuItem::~wxMenuItem() { } // 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 ; - + MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ; MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ; if( mhandle == NULL || index == 0) return ; - + if ( m_bitmap.Ok() ) { +#if wxUSE_BMPBUTTON ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ; + wxMacCreateBitmapButton( &info , m_bitmap ) ; if ( info.contentType != kControlNoContent ) { - if ( info.contentType == kControlContentCIconHandle ) - SetMenuItemIconHandle( mhandle , index , - kMenuColorIconType , (Handle) info.u.cIconHandle ) ; + if ( info.contentType == kControlContentIconRef ) + SetMenuItemIconHandle( mhandle , index , + kMenuIconRefType , (Handle) info.u.iconRef ) ; } - + wxMacReleaseBitmapButton( &info ) ; +#endif } } -void wxMenuItem::UpdateItemStatus() +void wxMenuItem::UpdateItemStatus() { if ( !m_parentMenu ) return ; - + + if ( IsSeparator() ) + return ; + #if TARGET_CARBON if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macPreferencesMenuItemId) { @@ -110,6 +114,7 @@ void wxMenuItem::UpdateItemStatus() else EnableMenuCommand( NULL , kHICommandPreferences ) ; } + if ( UMAGetSystemVersion() >= 0x1000 && GetId() == wxApp::s_macExitMenuItemId) { if ( !IsEnabled() ) @@ -118,53 +123,65 @@ void wxMenuItem::UpdateItemStatus() EnableMenuCommand( NULL , kHICommandQuit ) ; } #endif - { + + { MenuHandle mhandle = MAC_WXHMENU(m_parentMenu->GetHMenu()) ; MenuItemIndex index = m_parentMenu->MacGetIndexFromItem( this ) ; - if( mhandle == NULL || index == 0) + if ( mhandle == NULL || index == 0) 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 - UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; - wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ; + UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; + wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ; UMASetMenuItemShortcut( mhandle , index , entry ) ; delete entry ; } } -void wxMenuItem::UpdateItemText() +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 , wxFont::GetDefaultEncoding() ) ; - wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ; + UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; + wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ; UMASetMenuItemShortcut( mhandle , index , entry ) ; delete entry ; } - void wxMenuItem::Enable(bool bDoEnable) { - if ( m_isEnabled != bDoEnable ) + if (( m_isEnabled != bDoEnable +#if TARGET_CARBON + // avoid changing menuitem state when menu is disabled + // eg. BeginAppModalStateForWindow() will disable menus and ignore this change + // which in turn causes m_isEnabled to become out of sync with real menuitem state + && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0)) ) + // always update builtin menuitems + || ( GetId() == wxApp::s_macPreferencesMenuItemId + || GetId() == wxApp::s_macExitMenuItemId + || GetId() == wxApp::s_macAboutMenuItemId +#endif + )) { wxMenuItemBase::Enable( bDoEnable ) ; UpdateItemStatus() ; } } + void wxMenuItem::UncheckRadio() { - if ( m_isChecked ) + if ( m_isChecked ) { wxMenuItemBase::Check( false ) ; UpdateItemStatus() ; @@ -173,9 +190,9 @@ void wxMenuItem::UncheckRadio() 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 ) { @@ -183,7 +200,7 @@ void wxMenuItem::Check(bool 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); @@ -191,8 +208,7 @@ void wxMenuItem::Check(bool bDoCheck) _T("menuitem not found in the menu items list?") ); // get the radio group range - int start, - end; + int start, end; if ( m_isRadioGroupStart ) { @@ -208,13 +224,12 @@ void wxMenuItem::Check(bool bDoCheck) } // 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 ) - { ((wxMenuItem*)node->GetData())->UncheckRadio(); - } + node = node->GetNext(); } } @@ -234,7 +249,7 @@ void wxMenuItem::SetText(const wxString& text) return; wxMenuItemBase::SetText(text); - + UpdateItemText() ; } @@ -243,7 +258,7 @@ void wxMenuItem::SetText(const wxString& text) void wxMenuItem::SetAsRadioGroupStart() { - m_isRadioGroupStart = TRUE; + m_isRadioGroupStart = true; } void wxMenuItem::SetRadioGroupStart(int start)