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

bug in FindItemForId() fixed (?)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-06 08:50:10 +00:00
parent de4d7713bc
commit 9a48c2ba3d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/menu.cpp
View File

@@ -469,7 +469,6 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
// Finds the item id matching the given string, -1 if not found. // Finds the item id matching the given string, -1 if not found.
int wxMenu::FindItem (const wxString& itemString) const int wxMenu::FindItem (const wxString& itemString) const
{ {
// FIXME fixed size buffer
wxString itemLabel = wxStripMenuCodes(itemString); wxString itemLabel = wxStripMenuCodes(itemString);
for ( wxNode *node = m_menuItems.First(); node; node = node->Next() ) for ( wxNode *node = m_menuItems.First(); node; node = node->Next() )
{ {
@@ -497,7 +496,7 @@ wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
*itemMenu = NULL; *itemMenu = NULL;
wxMenuItem *item = NULL; wxMenuItem *item = NULL;
for ( wxNode *node = m_menuItems.First(); node; node = node->Next() ) for ( wxNode *node = m_menuItems.First(); node && !item; node = node->Next() )
{ {
item = (wxMenuItem *)node->Data(); item = (wxMenuItem *)node->Data();
@@ -505,13 +504,15 @@ wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
{ {
if (itemMenu) if (itemMenu)
*itemMenu = (wxMenu *)this; *itemMenu = (wxMenu *)this;
break;
} }
else if ( item->IsSubMenu() ) else if ( item->IsSubMenu() )
{ {
item = item->GetSubMenu()->FindItemForId(itemId, itemMenu); item = item->GetSubMenu()->FindItemForId(itemId, itemMenu);
if ( item ) }
break; else
{
// don't exit the loop
item = NULL;
} }
} }