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

Removed overloaded DoMenuUpdates function since it duplicated

Browse Source 
wxMenu::UpdateUI()
Removed routing of menu commands to focus window under Windows
Added routing of menu commands (but not UI updates, for
efficiency reasons) to wxMenuBar before sending to frame


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-07-09 14:20:30 +00:00
parent 63ad74ab2d
commit 18afa2acbe
4 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/framecmn.cpp
View File

@@ -413,47 +413,12 @@ void wxFrameBase::DoMenuUpdates()
{
wxMenuBar* bar = GetMenuBar();
#ifdef __WXMSW__
wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this);
#else
wxWindow* focusWin = (wxWindow*) NULL;
#endif
if ( bar != NULL )
{
wxEvtHandler* source = GetEventHandler();
int nCount = bar->GetMenuCount();
for (int n = 0; n < nCount; n++)
DoMenuUpdates(bar->GetMenu(n), focusWin);
}
}
// update a menu and all submenus recursively
void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
{
wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem* item = node->GetData();
if ( !item->IsSeparator() )
{
wxWindowID id = item->GetId();
wxUpdateUIEvent event(id);
event.SetEventObject( this );
if (evtHandler->ProcessEvent(event))
{
if (event.GetSetText())
menu->SetLabel(id, event.GetText());
if (event.GetSetChecked())
menu->Check(id, event.GetChecked());
if (event.GetSetEnabled())
menu->Enable(id, event.GetEnabled());
}
if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu(), focusWin);
}
node = node->GetNext();
bar->GetMenu(n)->UpdateUI(source);
}
}