X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..c5c9378c98eb13fc214acb01cd66deec6913fa43:/src/mac/menu.cpp?ds=sidebyside diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp index 427db90852..69bbdfd26d 100644 --- a/src/mac/menu.cpp +++ b/src/mac/menu.cpp @@ -10,6 +10,11 @@ ///////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ +#pragma implementation "menu.h" +#pragma implementation "menuitem.h" +#endif + // ============================================================================ // headers & declarations // ============================================================================ @@ -17,15 +22,13 @@ // wxWindows headers // ----------------- -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" -#endif - +#include "wx/app.h" #include "wx/menu.h" #include "wx/menuitem.h" +#include "wx/window.h" #include "wx/log.h" #include "wx/utils.h" +#include "wx/frame.h" #include "wx/mac/uma.h" @@ -33,12 +36,14 @@ // ---------------------- #include +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) +#endif // the (popup) menu title has this special id static const int idMenuTitle = -2; -static int formerHelpMenuItems = 0 ; +static MenuItemIndex firstUserHelpMenuItem = 0 ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; @@ -46,167 +51,31 @@ const short kwxMacAppleMenuId = 1 ; // ============================================================================ // implementation // ============================================================================ - -// -// 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 - -void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *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 ; - // 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 ; - if ( macShortCut ) - { - int pos = outMacItemText[0] ; - outMacItemText[++pos] = '/'; - outMacItemText[++pos] = toupper( macShortCut ); - outMacItemText[0] = pos ; - } -} +static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) ; +static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ); // Menus // Construct a menu with optional title (then use append) +#ifdef __DARWIN__ +short wxMenu::s_macNextMenuId = 3 ; +#else short wxMenu::s_macNextMenuId = 2 ; +#endif void wxMenu::Init() { m_doBreak = FALSE; + m_startRadioGroup = -1; // create the menu - Str255 label; - wxMacBuildMenuString( label, NULL , NULL , m_title , false ); m_macMenuId = s_macNextMenuId++; - wxCHECK_RET( s_macNextMenuId < 236 , "menu ids > 235 cannot be used for submenus on mac" ); - m_hMenu = ::NewMenu(m_macMenuId, label); + m_hMenu = UMANewMenu(m_macMenuId, m_title); if ( !m_hMenu ) { - wxLogLastError("CreatePopupMenu"); + wxLogLastError("UMANewMenu failed"); } // if we have a title, insert it in the beginning of the menu @@ -219,13 +88,8 @@ void wxMenu::Init() wxMenu::~wxMenu() { - if (m_hMenu) - ::DisposeMenu(m_hMenu); - -#if wxUSE_ACCEL - // delete accels - WX_CLEAR_ARRAY(m_accels); -#endif // wxUSE_ACCEL + if (MAC_WXHMENU(m_hMenu)) + ::DisposeMenu(MAC_WXHMENU(m_hMenu)); } void wxMenu::Break() @@ -233,139 +97,64 @@ void wxMenu::Break() // not available on the mac platform } -#if wxUSE_ACCEL - -int wxMenu::FindAccel(int id) const -{ - size_t n, count = m_accels.GetCount(); - for ( n = 0; n < count; n++ ) - { - if ( m_accels[n]->m_command == id ) - return n; - } - - return wxNOT_FOUND; -} - -void wxMenu::UpdateAccel(wxMenuItem *item) +void wxMenu::Attach(wxMenuBarBase *menubar) { - // find the (new) accel for this item - wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText()); - if ( accel ) - accel->m_command = item->GetId(); - - // find the old one - int n = FindAccel(item->GetId()); - if ( n == wxNOT_FOUND ) - { - // no old, add new if any - if ( accel ) - m_accels.Add(accel); - else - return; // skipping RebuildAccelTable() below - } - else - { - // replace old with new or just remove the old one if no new - delete m_accels[n]; - if ( accel ) - m_accels[n] = accel; - else - m_accels.Remove(n); - } + wxMenuBase::Attach(menubar); - if ( IsAttached() ) - { - m_menuBar->RebuildAccelTable(); - } + EndRadioGroup(); } -#endif // wxUSE_ACCEL - // function appends a new item or submenu to the menu // append a new item or submenu to the menu bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) { wxASSERT_MSG( pItem != NULL, "can't append NULL item to the menu" ); -#if wxUSE_ACCEL - UpdateAccel(pItem); -#endif // wxUSE_ACCEL if ( pItem->IsSeparator() ) { if ( pos == (size_t)-1 ) - { - MacAppendMenu(m_hMenu, "\p-"); - } + MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-"); else - { - MacInsertMenuItem(m_hMenu, "\p-" , pos); - } + MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos); } else { wxMenu *pSubMenu = pItem->GetSubMenu() ; if ( pSubMenu != NULL ) { - Str255 label; wxASSERT_MSG( pSubMenu->m_hMenu != NULL , "invalid submenu added"); pSubMenu->m_menuParent = this ; - wxMacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false); - // hardcoded adding of the submenu combination for mac - - int theEnd = label[0] + 1; - if (theEnd > 251) - theEnd = 251; // mac allows only 255 characters - label[theEnd++] = '/'; - label[theEnd++] = hMenuCmd; - label[theEnd++] = '!'; - label[theEnd++] = pSubMenu->m_macMenuId; - label[theEnd] = 0x00; - label[0] = theEnd; - if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) - { - ::InsertMenu( pSubMenu->m_hMenu , -1 ) ; - } + ::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ; if ( pos == (size_t)-1 ) - { - MacAppendMenu(m_hMenu, label); - } + UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), pSubMenu->m_macMenuId); else - { - MacInsertMenuItem(m_hMenu, label , pos); - } + UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText() , pos, pSubMenu->m_macMenuId); + pItem->UpdateItemBitmap() ; + pItem->UpdateItemStatus() ; } else { - Str255 label ; - wxMacBuildMenuString( label , NULL , NULL , pItem->GetText(), pItem->GetId() == wxApp::s_macAboutMenuItemId); - if ( label[0] == 0 ) - { - // we cannot add empty menus on mac - label[0] = 1 ; - label[1] = ' ' ; - } if ( pos == (size_t)-1 ) { - MacAppendMenu(m_hMenu, label); + UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), "a" ); + pos = CountMenuItems(MAC_WXHMENU(m_hMenu)) ; } else { - MacInsertMenuItem(m_hMenu, label , pos); + UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), "a" , pos); } + + SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; + pItem->UpdateItemText() ; + pItem->UpdateItemBitmap() ; + pItem->UpdateItemStatus() ; + if ( pItem->GetId() == idMenuTitle ) { - if ( pos == (size_t)-1 ) - { - UMADisableMenuItem( m_hMenu , CountMItems( m_hMenu ) ) ; - } - else - { - UMADisableMenuItem( m_hMenu , pos + 1 ) ; - } + UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ; } } } @@ -377,9 +166,67 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) return TRUE ; } +void wxMenu::EndRadioGroup() +{ + // we're not inside a radio group any longer + m_startRadioGroup = -1; +} + bool wxMenu::DoAppend(wxMenuItem *item) { - return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item); + wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") ); + + bool check = FALSE; + + if ( item->GetKind() == wxITEM_RADIO ) + { + int count = GetMenuItemCount(); + + if ( m_startRadioGroup == -1 ) + { + // start a new radio group + m_startRadioGroup = count; + + // for now it has just one element + item->SetAsRadioGroupStart(); + item->SetRadioGroupEnd(m_startRadioGroup); + + // ensure that we have a checked item in the radio group + check = TRUE; + } + else // extend the current radio group + { + // we need to update its end item + item->SetRadioGroupStart(m_startRadioGroup); + wxMenuItemList::Node *node = GetMenuItems().Item(m_startRadioGroup); + + if ( node ) + { + node->GetData()->SetRadioGroupEnd(count); + } + else + { + wxFAIL_MSG( _T("where is the radio group start item?") ); + } + } + } + else // not a radio item + { + EndRadioGroup(); + } + + if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) + { + return FALSE; + } + + if ( check ) + { + // check the item initially + item->Check(TRUE); + } + + return TRUE; } bool wxMenu::DoInsert(size_t pos, wxMenuItem *item) @@ -403,23 +250,11 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) // DoRemove() (unlike Remove) can only be called for existing item! wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") ); -#if wxUSE_ACCEL - // remove the corresponding accel from the accel table - int n = FindAccel(item->GetId()); - if ( n != wxNOT_FOUND ) - { - delete m_accels[n]; - - m_accels.Remove(n); - } - //else: this item doesn't have an accel, nothing to do -#endif // wxUSE_ACCEL - - ::DeleteMenuItem( m_hMenu , pos + 1); + ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1); if ( IsAttached() ) { - // otherwise, the chane won't be visible + // otherwise, the change won't be visible m_menuBar->Refresh(); } @@ -427,138 +262,11 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) return wxMenuBase::DoRemove(item); } -// --------------------------------------------------------------------------- -// accelerator helpers -// --------------------------------------------------------------------------- - -#if wxUSE_ACCEL - -// create the wxAcceleratorEntries for our accels and put them into provided -// array - return the number of accels we have -size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const -{ - size_t count = GetAccelCount(); - for ( size_t n = 0; n < count; n++ ) - { - *accels++ = *m_accels[n]; - } - - return count; -} - -#endif // wxUSE_ACCEL - void wxMenu::SetTitle(const wxString& label) { - Str255 title ; - m_title = label ; - wxMacBuildMenuString( title, NULL , NULL , label , false ); - UMASetMenuTitle( m_hMenu , title ) ; -} - -/* - -void wxMenu::SetLabel(int id, const wxString& label) -{ - Str255 maclabel ; - int index ; - wxMenuItem *item = FindItemForId(id) ; - if (item==NULL) - return; - - index = MacGetIndexFromItem( item ) ; - if (index < 1) - return; - - if (item->GetSubMenu()==NULL) - { - wxMacBuildMenuString( maclabel , NULL , NULL , label , false ); - ::SetMenuItemText( m_hMenu , index , maclabel ) ; - } - else - { - wxMacBuildMenuString( maclabel , NULL , NULL , label , false ); - ::SetMenuItemText( m_hMenu , index , maclabel ) ; - } - item->SetName(label); -} - -wxString wxMenu::GetLabel(int Id) const -{ - wxMenuItem *pItem = FindItemForId(Id) ; - return pItem->GetName() ; -} - -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const -{ - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetSubMenu()) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if (ans > -1) - return ans; - } - if ( !item->IsSeparator() ) - { - wxStripMenuCodes((char *)item->GetName().c_str(), buf2); - if (strcmp(buf1, buf2) == 0) - return item->GetId(); - } - } - - return -1; -} - -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const -{ - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - - if (item->GetId() == itemId) - { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; - } - - if (item->GetSubMenu()) - { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; - } - } - - if (itemMenu) - *itemMenu = NULL; - return NULL; -} - -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + m_title = label ; + UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label ) ; } - -wxString wxMenu::GetHelpString (int itemId) const -{ - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); -} -*/ - bool wxMenu::ProcessCommand(wxCommandEvent & event) { bool processed = FALSE; @@ -592,28 +300,12 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event) // other // --------------------------------------------------------------------------- -void wxMenu::Attach(wxMenuBar *menubar) -{ - // menu can be in at most one menubar because otherwise they would both - // delete the menu pointer - wxASSERT_MSG( !m_menuBar, wxT("menu belongs to 2 menubars, expect a crash") ); - - m_menuBar = menubar; -} - -void wxMenu::Detach() -{ - wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") ); - - m_menuBar = NULL; -} - wxWindow *wxMenu::GetWindow() const { if ( m_invokingWindow != NULL ) return m_invokingWindow; else if ( m_menuBar != NULL) - return m_menuBar->GetFrame(); + return (wxWindow *) m_menuBar->GetFrame(); return NULL; } @@ -659,119 +351,11 @@ int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem ) void wxMenu::MacEnableMenu( bool bDoEnable ) { - if ( bDoEnable ) - UMAEnableMenuItem( m_hMenu , 0 ) ; - else - UMADisableMenuItem( m_hMenu , 0 ) ; + UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 , bDoEnable ) ; ::DrawMenuBar() ; } -bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum ) -{ - int pos; - wxNode *node; - - if ( m_macMenuId == macMenuId ) - { - node = GetMenuItems().Nth(macMenuItemNum-1); - if (node) - { - wxMenuItem *pItem = (wxMenuItem*)node->Data(); - - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId()); - event.m_timeStamp = when; - event.SetEventObject(handler); - event.SetInt( pItem->GetId() ); - { - bool processed = false ; - -#if WXWIN_COMPATIBILITY - // Try a callback - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } -#endif - // Try the menu's event handler - if ( !processed && handler) - { - processed = handler->ProcessEvent(event); - } - - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); - } - return true ; - } - } - else if ( macMenuId == kHMHelpMenuID ) - { - int menuItem = formerHelpMenuItems ; - for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) - { - wxMenuItem * pItem = (wxMenuItem *) node->Data() ; - - wxMenu *pSubMenu = pItem->GetSubMenu() ; - if ( pSubMenu != NULL ) - { - } - else - { - if ( pItem->GetId() != wxApp::s_macAboutMenuItemId ) - ++menuItem ; - - if ( menuItem == macMenuItemNum ) - { - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId()); - event.m_timeStamp = when; - event.SetEventObject(handler); - event.SetInt( pItem->GetId() ); - { - bool processed = false ; -#if WXWIN_COMPATIBILITY - // Try a callback - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } -#endif - // Try the menu's event handler - if ( !processed && handler) - { - processed = handler->ProcessEvent(event); - } - - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event); - } - return true ; - } - } - } - } - - for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) - { - wxMenuItem * pItem = (wxMenuItem *) node->Data() ; - - wxMenu *pSubMenu = pItem->GetSubMenu() ; - if ( pSubMenu != NULL ) - { - if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) - return true ; - } - } - - return false ; -} - // Menu Bar /* @@ -797,6 +381,7 @@ void wxMenuBar::Init() { m_eventHandler = this; m_menuBarFrame = NULL; + m_invokingWindow = (wxWindow*) NULL; } wxMenuBar::wxMenuBar() @@ -835,135 +420,168 @@ wxMenuBar::~wxMenuBar() } -void wxMenuBar::Refresh() +void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect)) { wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") ); DrawMenuBar(); } -#if wxUSE_ACCEL - -void wxMenuBar::RebuildAccelTable() +void wxMenuBar::MacInstallMenuBar() { - // merge the accelerators of all menus into one accel table - size_t nAccelCount = 0; - size_t i, count = GetMenuCount(); - for ( i = 0; i < count; i++ ) - { - nAccelCount += m_menus[i]->GetAccelCount(); - } + if ( s_macInstalledMenuBar == this ) + return ; + + wxStAppResource resload ; + + Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; + wxString message ; + wxCHECK_RET( menubar != NULL, "can't read MBAR resource" ); + ::SetMenuBar( menubar ) ; +#if TARGET_API_MAC_CARBON + ::DisposeMenuBar( menubar ) ; +#else + ::DisposeHandle( menubar ) ; +#endif - if ( nAccelCount ) +#if TARGET_API_MAC_OS8 + MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ; + if ( CountMenuItems( menu ) == 2 ) { - wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount]; - - nAccelCount = 0; - for ( i = 0; i < count; i++ ) - { - nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]); - } - - m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries); - - delete [] accelEntries; + ::AppendResMenu(menu, 'DRVR'); } -} - -#endif // wxUSE_ACCEL - - -void wxMenuBar::MacInstallMenuBar() -{ - Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ; - wxString message ; - wxCHECK_RET( menubar != NULL, "can't read MBAR resource" ); - ::SetMenuBar( menubar ) ; - ::DisposeHandle( menubar ) ; - - MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ; - ::AppendResMenu(menu, 'DRVR'); +#endif - for (int i = 0; i < m_menus.GetCount(); i++) + // clean-up the help menu before adding new items + MenuHandle mh = NULL ; + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) + { + for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) + { + DeleteMenuItem( mh , i ) ; + } + } + else + { + mh = NULL ; + } +#if TARGET_CARBON + if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId) + { + wxMenuItem *item = FindItem( wxApp::s_macPreferencesMenuItemId , NULL ) ; + if ( item == NULL || !(item->IsEnabled()) ) + DisableMenuCommand( NULL , kHICommandPreferences ) ; + else + EnableMenuCommand( NULL , kHICommandPreferences ) ; + } +#endif + for (size_t i = 0; i < m_menus.GetCount(); i++) { - Str255 label; - wxNode *node; - wxMenuItem *item; - int pos ; - wxMenu* menu = m_menus[i] , *subMenu = NULL ; - - - if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) + Str255 label; + wxMenuItemList::Node *node; + wxMenuItem *item; + int pos ; + wxMenu* menu = m_menus[i] , *subMenu = NULL ; + + if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) + { + if ( mh == NULL ) { - MenuHandle mh = NULL ; - if ( HMGetHelpMenuHandle( &mh ) != noErr ) + continue ; + } + + for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) + { + item = (wxMenuItem *)node->GetData(); + subMenu = item->GetSubMenu() ; + if (subMenu) { - continue ; + // we don't support hierarchical menus in the help menu yet } - if ( formerHelpMenuItems == 0 ) + else { - if( mh ) - formerHelpMenuItems = CountMenuItems( mh ) ; - } - - for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) - { - item = (wxMenuItem *)node->Data(); - subMenu = item->GetSubMenu() ; - if (subMenu) + if ( item->IsSeparator() ) { - // we don't support hierarchical menus in the help menu yet + if ( mh ) + MacAppendMenu(mh, "\p-" ); } - else + else { - if ( item->IsSeparator() ) - { - if ( mh ) - ::AppendMenu(mh, "\p-" ); - } + wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ; + + if ( item->GetId() == wxApp::s_macAboutMenuItemId ) + { + UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() ); + UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true ); + SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ; + UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ; + } else { - Str255 label ; - wxMacBuildMenuString( label , NULL , NULL , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu - if ( label[0] == 0 ) - { - // we cannot add empty menus on mac - label[0] = 1 ; - label[1] = ' ' ; - } - if ( item->GetId() == wxApp::s_macAboutMenuItemId ) - { - ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label ); - // ::EnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 ); - ::EnableItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 ); - } - else + if ( mh ) { - if ( mh ) - ::AppendMenu(mh, label ); + UMAAppendMenuItem(mh, item->GetText() , entry ); + SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ; } } + + delete entry ; } } } - else - { - wxMacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); - UMASetMenuTitle( menu->GetHMenu() , label ) ; - for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) - { - item = (wxMenuItem *)node->Data(); - subMenu = item->GetSubMenu() ; - if (subMenu) + } + else + { + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i] ) ; + wxArrayPtrVoid submenus ; + wxMenuItem* previousItem = NULL ; + for (pos = 0, node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) + { + item = (wxMenuItem *)node->GetData(); + subMenu = item->GetSubMenu() ; + if (subMenu) + { + submenus.Add(subMenu) ; + } + else + { +#if TARGET_CARBON + if ( UMAGetSystemVersion() >= 0x1000 ) { - ::InsertMenu( subMenu->GetHMenu() , -1 ) ; + if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId) + { + ChangeMenuItemAttributes( MAC_WXHMENU( menu->GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 ); + if ( menu->GetMenuItems().GetCount() == pos + 1 && previousItem != NULL && previousItem->IsSeparator() ) + { + ChangeMenuItemAttributes( MAC_WXHMENU( menu->GetHMenu() ) , pos , kMenuItemAttrHidden, 0 ); + } + } } +#endif } - ::InsertMenu(m_menus[i]->GetHMenu(), 0); + previousItem = item ; } + ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0); + for ( size_t i = 0 ; i < submenus.GetCount() ; ++i ) + { + wxMenu* submenu = (wxMenu*) submenus[i] ; + wxMenuItemList::Node *subnode; + wxMenuItem *subitem; + int subpos ; + for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++) + { + subitem = (wxMenuItem *)subnode->GetData(); + wxMenu* itsSubMenu = subitem->GetSubMenu() ; + if (itsSubMenu) + { + submenus.Add(itsSubMenu) ; + } + } + ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ; + } } - ::DrawMenuBar() ; - + } + ::DrawMenuBar() ; s_macInstalledMenuBar = this; } @@ -1039,29 +657,18 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; { - Str255 label; - wxMacBuildMenuString( label, NULL , NULL , title , false ); - UMASetMenuTitle( menu->GetHMenu() , label ) ; + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ; if ( pos == m_menus.GetCount() - 1) { - ::InsertMenu( menu->GetHMenu() , 0 ) ; + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; } else { - ::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ; + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ; } } } - -#if wxUSE_ACCEL - if ( menuOld->HasAccels() || menu->HasAccels() ) - { - // need to rebuild accell table - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); } @@ -1075,73 +682,24 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) m_titles.Insert(title, pos); - menu->Attach(this); + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ; if ( IsAttached() ) { - if ( pos == (size_t) -1 ) + if ( pos == (size_t) -1 || pos + 1 == m_menus.GetCount() ) { - ::InsertMenu( menu->GetHMenu() , 0 ) ; + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; } else { - ::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ; + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ; } - -#if wxUSE_ACCEL - if ( menu->HasAccels() ) - { - // need to rebuild accell table - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); } return TRUE; } -void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) -{ - // first scan fast for direct commands, i.e. menus which have these commands directly in their own list - - if ( macMenuId == kwxMacAppleMenuId && macMenuItemNum == 1 ) - { - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macAboutMenuItemId ); - event.m_timeStamp = when; - event.SetEventObject(handler); - event.SetInt( wxApp::s_macAboutMenuItemId ); - handler->ProcessEvent(event); - } - else - { - for (int i = 0; i < m_menus.GetCount() ; i++) - { - if ( m_menus[i]->MacGetMenuId() == macMenuId || - ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) - ) - { - if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) - return ; - else - { - //TODO flag this as an error since it must contain the item - return ; - } - } - } - - for (int i = 0; i < m_menus.GetCount(); i++) - { - if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) ) - { - break ; - } - } - } -} - wxMenu *wxMenuBar::Remove(size_t pos) { wxMenu *menu = wxMenuBarBase::Remove(pos); @@ -1157,14 +715,6 @@ wxMenu *wxMenuBar::Remove(size_t pos) menu->Detach(); -#if wxUSE_ACCEL - if ( menu->HasAccels() ) - { - // need to rebuild accell table - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); } @@ -1181,31 +731,89 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) if ( !wxMenuBarBase::Append(menu, title) ) return FALSE; - menu->Attach(this); - m_titles.Add(title); + + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title ) ; if ( IsAttached() ) { if (s_macInstalledMenuBar == this) { - ::InsertMenu( menu->GetHMenu() , 0 ) ; + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; } -#if wxUSE_ACCEL - if ( menu->HasAccels() ) - { - // need to rebuild accell table - RebuildAccelTable(); - } -#endif // wxUSE_ACCEL - Refresh(); } + // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables + // adding menu later on. + if (m_invokingWindow) + wxMenubarSetInvokingWindow( menu, m_invokingWindow ); + return TRUE; } +static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) +{ + menu->SetInvokingWindow( (wxWindow*) NULL ); + + wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu() ); + node = node->GetNext(); + } +} + +static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) +{ + menu->SetInvokingWindow( win ); + + wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst(); + while (node) + { + wxMenuItem *menuitem = node->GetData(); + if (menuitem->IsSubMenu()) + wxMenubarSetInvokingWindow( menuitem->GetSubMenu() , win ); + node = node->GetNext(); + } +} + +void wxMenuBar::UnsetInvokingWindow() +{ + m_invokingWindow = (wxWindow*) NULL; + wxMenuList::Node *node = m_menus.GetFirst(); + while (node) + { + wxMenu *menu = node->GetData(); + wxMenubarUnsetInvokingWindow( menu ); + node = node->GetNext(); + } +} + +void wxMenuBar::SetInvokingWindow(wxFrame *frame) +{ + m_invokingWindow = frame; + wxMenuList::Node *node = m_menus.GetFirst(); + while (node) + { + wxMenu *menu = node->GetData(); + wxMenubarSetInvokingWindow( menu, frame ); + node = node->GetNext(); + } +} + +void wxMenuBar::Detach() +{ + wxMenuBarBase::Detach() ; +} + +void wxMenuBar::Attach(wxFrame *frame) +{ + wxMenuBarBase::Attach( frame ) ; +} // --------------------------------------------------------------------------- // wxMenuBar searching for menu items // ---------------------------------------------------------------------------