X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2103c8ca5a37b85c1eb4ce2edeb95e347e5e27d..7ad25aed02fa53612cd94a422904667c46fafcbb:/src/mac/carbon/menu.cpp?ds=inline diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index e07057a303..b65b04b6fc 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" -#endif - // ============================================================================ // headers & declarations // ============================================================================ @@ -37,14 +32,11 @@ // ---------------------- #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 = -3; -static MenuItemIndex firstUserHelpMenuItem = 0 ; const short kwxMacMenuBarResource = 1 ; const short kwxMacAppleMenuId = 1 ; @@ -52,34 +44,6 @@ const short kwxMacAppleMenuId = 1 ; // Find an item given the Macintosh Menu Reference -#if KEY_wxList_DEPRECATED -wxList wxWinMacMenuList(wxKEY_INTEGER); -wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef) -{ - wxNode *node = wxWinMacMenuList.Find((long)inMenuRef); - if (!node) - return NULL; - return (wxMenu *)node->GetData(); -} - -void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ; -void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) -{ - // adding NULL MenuRef is (first) surely a result of an error and - // (secondly) breaks menu command processing - wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") ); - - if ( !wxWinMacMenuList.Find((long)inMenuRef) ) - wxWinMacMenuList.Append((long)inMenuRef, menu); -} - -void wxRemoveMacMenuAssociation(wxMenu *menu) ; -void wxRemoveMacMenuAssociation(wxMenu *menu) -{ - wxWinMacMenuList.DeleteObject(menu); -} -#else - WX_DECLARE_HASH_MAP(MenuRef, wxMenu*, wxPointerHash, wxPointerEqual, MacMenuMap); static MacMenuMap wxWinMacMenuList; @@ -115,7 +79,6 @@ void wxRemoveMacMenuAssociation(wxMenu *menu) } } } -#endif // deprecated wxList // ============================================================================ // implementation @@ -138,15 +101,16 @@ wxMenu * _wxMenuAt(const wxMenuList &menuList, size_t pos) { wxMenuList::compatibility_iterator menuIter = menuList.GetFirst(); - - while (pos-- > 0) menuIter = menuIter->GetNext(); - + + while (pos-- > 0) + menuIter = menuIter->GetNext(); + return menuIter->GetData() ; } void wxMenu::Init() { - m_doBreak = FALSE; + m_doBreak = false; m_startRadioGroup = -1; // create the menu @@ -161,7 +125,7 @@ void wxMenu::Init() wxAssociateMenuWithMacMenu( (MenuRef)m_hMenu , this ) ; // if we have a title, insert it in the beginning of the menu - if ( !!m_title ) + if ( !m_title.empty() ) { Append(idMenuTitle, m_title) ; AppendSeparator() ; @@ -205,18 +169,17 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) wxMenu *pSubMenu = pItem->GetSubMenu() ; if ( pSubMenu != NULL ) { - wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added")); + wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added")); pSubMenu->m_menuParent = this ; if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar()) - { pSubMenu->MacBeforeDisplay( true ) ; - } if ( pos == (size_t)-1 ) - UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pSubMenu->m_macMenuId); + UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding(), pSubMenu->m_macMenuId); else - UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pos, pSubMenu->m_macMenuId); + UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding(), pos, pSubMenu->m_macMenuId); + pItem->UpdateItemBitmap() ; pItem->UpdateItemStatus() ; } @@ -235,25 +198,23 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos) UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos); pos += 1 ; } - - SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ; + + SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , wxIdToMacCommand ( pItem->GetId() ) ) ; SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ; pItem->UpdateItemText() ; pItem->UpdateItemBitmap() ; pItem->UpdateItemStatus() ; - if ( pItem->GetId() == idMenuTitle ) - { + if ( pItem->GetId() == idMenuTitle ) UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ; - } } } + // if we're already attached to the menubar, we must update it - if ( IsAttached() ) - { + if ( IsAttached() && GetMenuBar()->IsAttached() ) GetMenuBar()->Refresh(); - } - return TRUE ; + + return true ; } void wxMenu::EndRadioGroup() @@ -266,7 +227,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) { wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") ); - bool check = FALSE; + bool check = false; if ( item->GetKind() == wxITEM_RADIO ) { @@ -282,7 +243,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) item->SetRadioGroupEnd(m_startRadioGroup); // ensure that we have a checked item in the radio group - check = TRUE; + check = true; } else // extend the current radio group { @@ -306,15 +267,11 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item) } if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) ) - { return NULL; - } if ( check ) - { // check the item initially - item->Check(TRUE); - } + item->Check(true); return item; } @@ -323,8 +280,8 @@ wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos)) return item; - else - return NULL; + + return NULL; } wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) @@ -332,6 +289,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) // we need to find the items position in the child list size_t pos; wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + for ( pos = 0; node; pos++ ) { if ( node->GetData() == item ) @@ -345,11 +303,9 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1); - if ( IsAttached() ) - { + if ( IsAttached() && GetMenuBar()->IsAttached() ) // otherwise, the change won't be visible GetMenuBar()->Refresh(); - } // and from internal data structures return wxMenuBase::DoRemove(item); @@ -357,21 +313,20 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) void wxMenu::SetTitle(const wxString& label) { - m_title = label ; + m_title = label ; UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label , wxFont::GetDefaultEncoding() ) ; } + bool wxMenu::ProcessCommand(wxCommandEvent & event) { - bool processed = FALSE; + bool processed = false; // Try the menu's event handler - if ( !processed && GetEventHandler()) - { + if ( /* !processed && */ GetEventHandler()) processed = GetEventHandler()->ProcessEvent(event); - } - // Try the window the menu was popped up from (and up through the - // hierarchy) + // Try the window the menu was popped up from + // (and up through the hierarchy) wxWindow *win = GetInvokingWindow(); if ( !processed && win ) processed = win->GetEventHandler()->ProcessEvent(event); @@ -379,7 +334,6 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event) return processed; } - // --------------------------------------------------------------------------- // other // --------------------------------------------------------------------------- @@ -441,14 +395,15 @@ void wxMenu::MacEnableMenu( bool bDoEnable ) } // MacOS needs to know about submenus somewhere within this menu -// before it can be displayed , also hide special menu items like preferences -// that are handled by the OS +// before it can be displayed, also hide special menu items +// like preferences that are handled by the OS void wxMenu::MacBeforeDisplay( bool isSubMenu ) { wxMenuItem* previousItem = NULL ; size_t pos ; wxMenuItemList::compatibility_iterator node; wxMenuItem *item; + for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) { item = (wxMenuItem *)node->GetData(); @@ -459,70 +414,71 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu ) } else // normal item { - #if TARGET_CARBON - if ( UMAGetSystemVersion() >= 0x1000 ) +#if TARGET_CARBON + // what we do here is to hide the special items which are + // shown in the application menu anyhow -- it doesn't make + // sense to show them in their normal place as well + if ( item->GetId() == wxApp::s_macAboutMenuItemId || + ( UMAGetSystemVersion() >= 0x1000 && ( + item->GetId() == wxApp::s_macPreferencesMenuItemId || + item->GetId() == wxApp::s_macExitMenuItemId ) ) ) + { - // what we do here is to hide the special items which are - // shown in the application menu anyhow -- it doesn't make - // sense to show them in their normal place as well - if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || - item->GetId() == wxApp::s_macExitMenuItemId ) + ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), + pos + 1, kMenuItemAttrHidden, 0 ); + + // also check for a separator which was used just to + // separate this item from the others, so don't leave + // separator at the menu start or end nor 2 consecutive + // separators + wxMenuItemList::compatibility_iterator nextNode = node->GetNext(); + wxMenuItem *next = nextNode ? nextNode->GetData() : NULL; + + size_t posSeptoHide; + if ( !previousItem && next && next->IsSeparator() ) { - ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), - pos + 1, kMenuItemAttrHidden, 0 ); - - // also check for a separator which was used just to - // separate this item from the others, so don't leave - // separator at the menu start or end nor 2 consecutive - // separators - wxMenuItemList::compatibility_iterator nextNode = node->GetNext(); - wxMenuItem *next = nextNode ? nextNode->GetData() : NULL; - - size_t posSeptoHide; - if ( !previousItem && next && next->IsSeparator() ) - { - // next (i.e. second as we must be first) item is - // the separator to hide - wxASSERT_MSG( pos == 0, _T("should be the menu start") ); - posSeptoHide = 2; - } - else if ( GetMenuItems().GetCount() == pos + 1 && - previousItem != NULL && - previousItem->IsSeparator() ) - { - // prev item is a trailing separator we want to hide - posSeptoHide = pos; - } - else if ( previousItem && previousItem->IsSeparator() && - next && next->IsSeparator() ) - { - // two consecutive separators, this is one too many - posSeptoHide = pos; - } - else // no separators to hide - { - posSeptoHide = 0; - } + // next (i.e. second as we must be first) item is + // the separator to hide + wxASSERT_MSG( pos == 0, _T("should be the menu start") ); + posSeptoHide = 2; + } + else if ( GetMenuItems().GetCount() == pos + 1 && + previousItem != NULL && + previousItem->IsSeparator() ) + { + // prev item is a trailing separator we want to hide + posSeptoHide = pos; + } + else if ( previousItem && previousItem->IsSeparator() && + next && next->IsSeparator() ) + { + // two consecutive separators, this is one too many + posSeptoHide = pos; + } + else // no separators to hide + { + posSeptoHide = 0; + } - if ( posSeptoHide ) - { - // hide the separator as well - ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), - posSeptoHide, - kMenuItemAttrHidden, - 0 ); - } + if ( posSeptoHide ) + { + // hide the separator as well + ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), + posSeptoHide, + kMenuItemAttrHidden, + 0 ); } } - #endif // TARGET_CARBON +#endif // TARGET_CARBON } + previousItem = item ; } if ( isSubMenu ) ::InsertMenu(MAC_WXHMENU( GetHMenu()), -1); - } + // undo all changes from the MacBeforeDisplay call void wxMenu::MacAfterDisplay( bool isSubMenu ) { @@ -530,9 +486,10 @@ void wxMenu::MacAfterDisplay( bool isSubMenu ) ::DeleteMenu(MacGetMenuId()); wxMenuItem* previousItem = NULL ; - int pos ; wxMenuItemList::compatibility_iterator node; wxMenuItem *item; + int pos ; + for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) { item = (wxMenuItem *)node->GetData(); @@ -545,6 +502,7 @@ void wxMenu::MacAfterDisplay( bool isSubMenu ) { // no need to undo hidings } + previousItem = item ; } } @@ -570,6 +528,8 @@ auto-merge for MDI in case this will be necessary wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ; wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ; +bool wxMenuBar::s_macAutoWindowMenu = true ; +WXHMENU wxMenuBar::s_macWindowMenuHandle = NULL ; void wxMenuBar::Init() { @@ -588,7 +548,6 @@ wxMenuBar::wxMenuBar( long WXUNUSED(style) ) Init(); } - wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { Init(); @@ -608,12 +567,12 @@ wxMenuBar::~wxMenuBar() { if (s_macCommonMenuBar == this) s_macCommonMenuBar = NULL; + if (s_macInstalledMenuBar == this) { ::ClearMenuBar(); s_macInstalledMenuBar = NULL; } - } void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect)) @@ -629,12 +588,14 @@ void wxMenuBar::MacInstallMenuBar() return ; MenuBarHandle menubar = NULL ; + #if TARGET_API_MAC_OSX menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ; #else menubar = NewHandleClear( 12 ) ; (*menubar)[3] = 0x0a ; #endif + ::SetMenuBar( menubar ) ; DisposeMenuBar( menubar ) ; MenuHandle appleMenu = NULL ; @@ -654,18 +615,22 @@ void wxMenuBar::MacInstallMenuBar() MacInsertMenu( appleMenu , 0 ) ; // clean-up the help menu before adding new items - MenuHandle mh = NULL ; - if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) + static MenuHandle mh = NULL ; + + if ( mh != NULL ) { - for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) + MenuItemIndex firstUserHelpMenuItem ; + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) { - DeleteMenuItem( mh , i ) ; + for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) + DeleteMenuItem( mh , i ) ; + } + else + { + mh = NULL ; } } - else - { - mh = NULL ; - } + #if TARGET_CARBON if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId) { @@ -675,6 +640,7 @@ void wxMenuBar::MacInstallMenuBar() else EnableMenuCommand( NULL , kHICommandPreferences ) ; } + // Unlike preferences which may or may not exist, the Quit item should be always // enabled unless it is added by the application and then disabled, otherwise // a program would be required to add an item with wxID_EXIT in order to get the @@ -688,32 +654,40 @@ void wxMenuBar::MacInstallMenuBar() EnableMenuCommand( NULL , kHICommandQuit ) ; } #endif - wxMenuList::compatibility_iterator menuIter = m_menus.GetFirst(); - // - for (size_t i = 0; i < m_menus.GetCount(); i++, menuIter = menuIter->GetNext()) - { + + wxMenuList::compatibility_iterator menuIter = m_menus.GetFirst(); + for (size_t i = 0; i < m_menus.GetCount(); i++, menuIter = menuIter->GetNext()) + { wxMenuItemList::compatibility_iterator node; wxMenuItem *item; int pos ; wxMenu* menu = menuIter->GetData() , *subMenu = NULL ; - if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName ) + if ( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName ) { - if ( mh == NULL ) + for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) { - continue ; - } - - for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) - { - item = (wxMenuItem *)node->GetData(); - subMenu = item->GetSubMenu() ; + item = (wxMenuItem *)node->GetData(); + subMenu = item->GetSubMenu() ; if (subMenu) { // we don't support hierarchical menus in the help menu yet } else { + if ( item->GetId() != wxApp::s_macAboutMenuItemId ) + { + if ( mh == NULL ) + { + MenuItemIndex firstUserHelpMenuItem ; + if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr ) + { + mh = NULL ; + break ; + } + } + } + if ( item->IsSeparator() ) { if ( mh ) @@ -725,18 +699,14 @@ void wxMenuBar::MacInstallMenuBar() if ( item->GetId() == wxApp::s_macAboutMenuItemId ) { - UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() ); - UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true ); - SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ; - SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ; - UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ; - } + // this will be taken care of below + } else { if ( mh ) { - UMAAppendMenuItem(mh, item->GetText() , wxFont::GetDefaultEncoding(), entry); - SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ; + UMAAppendMenuItem(mh, item->GetText() , wxFont::GetDefaultEncoding(), entry); + SetMenuItemCommandID( mh , CountMenuItems(mh) , wxIdToMacCommand ( item->GetId() ) ) ; SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ; } } @@ -753,6 +723,30 @@ void wxMenuBar::MacInstallMenuBar() ::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0); } } + + // take care of the about menu item wherever it is + { + wxMenu* aboutMenu ; + wxMenuItem *aboutMenuItem = FindItem(wxApp::s_macAboutMenuItemId , &aboutMenu) ; + if ( aboutMenuItem ) + { + wxAcceleratorEntry* entry = wxGetAccelFromString( aboutMenuItem->GetText() ) ; + UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , aboutMenuItem->GetText() , wxFont::GetDefaultEncoding() ); + UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true ); + SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , kHICommandAbout ) ; + SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)aboutMenuItem ) ; + UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ; + } + } + + if ( GetAutoWindowMenu() ) + { + if ( MacGetWindowMenuHMenu() == NULL ) + CreateStandardWindowMenu( 0 , (MenuHandle*) &s_macWindowMenuHandle ) ; + + InsertMenu( (MenuHandle) MacGetWindowMenuHMenu() , 0 ) ; + } + ::DrawMenuBar() ; s_macInstalledMenuBar = this; } @@ -760,18 +754,19 @@ void wxMenuBar::MacInstallMenuBar() void wxMenuBar::EnableTop(size_t pos, bool enable) { wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") ); + _wxMenuAt(m_menus, pos)->MacEnableMenu( enable ) ; Refresh(); } -bool wxMenuBar::Enable( bool enable) +bool wxMenuBar::Enable(bool enable) { wxCHECK_MSG( IsAttached(), false, wxT("doesn't work with unattached menubars") ); + size_t i; for (i = 0; i < GetMenuCount(); i++) - { EnableTop(i, enable); - } + return true; } @@ -782,9 +777,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) m_titles[pos] = label; if ( !IsAttached() ) - { return; - } _wxMenuAt(m_menus, pos)->SetTitle( label ) ; @@ -816,10 +809,8 @@ int wxMenuBar::FindMenu(const wxString& title) } return wxNOT_FOUND; - } - // --------------------------------------------------------------------------- // wxMenuBar construction // --------------------------------------------------------------------------- @@ -828,7 +819,8 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title); if ( !menuOld ) - return FALSE; + return false; + m_titles[pos] = title; if ( IsAttached() ) @@ -837,22 +829,18 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { menuOld->MacAfterDisplay( false ) ; ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; - { - menu->MacBeforeDisplay( false ) ; - UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ; - if ( pos == m_menus.GetCount() - 1) - { - ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; - } - else - { - ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ; - } - } + + menu->MacBeforeDisplay( false ) ; + UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ; + if ( pos == m_menus.GetCount() - 1) + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; + else + ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos + 1)->MacGetMenuId() ) ; } Refresh(); } + if (m_invokingWindow) wxMenubarSetInvokingWindow( menu, m_invokingWindow ); @@ -862,7 +850,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + return false; m_titles.Insert(title, pos); @@ -873,21 +861,20 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) if (s_macInstalledMenuBar == this) { menu->MacBeforeDisplay( false ) ; + if ( pos == (size_t) -1 || pos + 1 == m_menus.GetCount() ) - { ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ; - } else - { ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , _wxMenuAt(m_menus, pos+1)->MacGetMenuId() ) ; - } } + Refresh(); } + if (m_invokingWindow) wxMenubarSetInvokingWindow( menu, m_invokingWindow ); - return TRUE; + return true; } wxMenu *wxMenuBar::Remove(size_t pos) @@ -899,9 +886,7 @@ wxMenu *wxMenuBar::Remove(size_t pos) if ( IsAttached() ) { if (s_macInstalledMenuBar == this) - { ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ; - } Refresh(); } @@ -914,10 +899,10 @@ wxMenu *wxMenuBar::Remove(size_t pos) bool wxMenuBar::Append(wxMenu *menu, const wxString& title) { WXHMENU submenu = menu ? menu->GetHMenu() : 0; - wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") ); + wxCHECK_MSG( submenu, false, wxT("can't append invalid menu to menubar") ); if ( !wxMenuBarBase::Append(menu, title) ) - return FALSE; + return false; m_titles.Add(title); @@ -939,19 +924,20 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) if (m_invokingWindow) wxMenubarSetInvokingWindow( menu, m_invokingWindow ); - return TRUE; + return true; } static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) { menu->SetInvokingWindow( (wxWindow*) NULL ); - wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) { wxMenuItem *menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu() ); + node = node->GetNext(); } } @@ -959,13 +945,15 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) { menu->SetInvokingWindow( win ); - + wxMenuItem *menuitem; wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst(); + while (node) { - wxMenuItem *menuitem = node->GetData(); + menuitem = node->GetData(); if (menuitem->IsSubMenu()) wxMenubarSetInvokingWindow( menuitem->GetSubMenu() , win ); + node = node->GetNext(); } } @@ -973,11 +961,14 @@ static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win ) void wxMenuBar::UnsetInvokingWindow() { m_invokingWindow = (wxWindow*) NULL; + wxMenu *menu; wxMenuList::compatibility_iterator node = m_menus.GetFirst(); + while (node) { - wxMenu *menu = node->GetData(); + menu = node->GetData(); wxMenubarUnsetInvokingWindow( menu ); + node = node->GetNext(); } } @@ -985,11 +976,14 @@ void wxMenuBar::UnsetInvokingWindow() void wxMenuBar::SetInvokingWindow(wxFrame *frame) { m_invokingWindow = frame; + wxMenu *menu; wxMenuList::compatibility_iterator node = m_menus.GetFirst(); + while (node) { - wxMenu *menu = node->GetData(); + menu = node->GetData(); wxMenubarSetInvokingWindow( menu, frame ); + node = node->GetNext(); } } @@ -1003,6 +997,7 @@ void wxMenuBar::Attach(wxFrame *frame) { wxMenuBarBase::Attach( frame ) ; } + // --------------------------------------------------------------------------- // wxMenuBar searching for menu items // --------------------------------------------------------------------------- @@ -1031,11 +1026,7 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const wxMenuItem *item = NULL; size_t count = GetMenuCount(); for ( size_t i = 0; !item && (i < count); i++ ) - { item = _wxMenuAt(m_menus, i)->FindItem(id, itemMenu); - } return item; } - -