Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just get rid of _wxMenuAt() in wxOSX menu code.

Browse Source 
The _wxMenuAt() function was totally unnecessary and duplicated the existing
wxMenuBar::GetMenu() so simply remove it and use GetMenu() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-12-19 15:02:38 +00:00
parent 4027f0d759
commit 8a1459665d
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osx/menu_osx.cpp
View File

@@ -57,18 +57,6 @@ static const int idMenuTitle = -3;
// Construct a menu with optional title (then use append) // Construct a menu with optional title (then use append)
static
wxMenu *
_wxMenuAt(const wxMenuList &menuList, size_t pos)
{
wxMenuList::compatibility_iterator menuIter = menuList.GetFirst();
while (pos-- > 0)
menuIter = menuIter->GetNext();
return menuIter->GetData() ;
}
void wxMenu::Init() void wxMenu::Init()
{ {
m_doBreak = false; m_doBreak = false;
@@ -776,7 +764,7 @@ void wxMenuBar::MacInstallMenuBar()
UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], GetFont().GetEncoding() ) ; UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], GetFont().GetEncoding() ) ;
menu->MacBeforeDisplay(false) ; menu->MacBeforeDisplay(false) ;
::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0); ::InsertMenu(MAC_WXHMENU(GetMenu(i)->GetHMenu()), 0);
} }
} }
@@ -840,7 +828,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
if ( !IsAttached() ) if ( !IsAttached() )
return; return;
_wxMenuAt(m_menus, pos)->SetTitle( label ) ; GetMenu(pos)->SetTitle( label ) ;
} }
wxString wxMenuBar::GetMenuLabel(size_t pos) const wxString wxMenuBar::GetMenuLabel(size_t pos) const
@@ -952,7 +940,7 @@ int wxMenuBar::FindMenuItem(const wxString& menuString,
{ {
wxString title = wxStripMenuCodes(m_titles[i]); wxString title = wxStripMenuCodes(m_titles[i]);
if ( menuLabel == title ) if ( menuLabel == title )
return _wxMenuAt(m_menus, i)->FindItem(itemString); return GetMenu(i)->FindItem(itemString);
} }
return wxNOT_FOUND; return wxNOT_FOUND;
@@ -966,7 +954,7 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
wxMenuItem *item = NULL; wxMenuItem *item = NULL;
size_t count = GetMenuCount(); size_t count = GetMenuCount();
for ( size_t i = 0; !item && (i < count); i++ ) for ( size_t i = 0; !item && (i < count); i++ )
item = _wxMenuAt(m_menus, i)->FindItem(id, itemMenu); item = GetMenu(i)->FindItem(id, itemMenu);
return item; return item;
} }