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

Changed the focus-window event handling back

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-04-08 14:42:46 +00:00
parent e702ff0f08
commit 6c41a418df
10 changed files with 14 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/framecmn.cpp
View File

@@ -31,20 +31,17 @@ void wxFrame::DoMenuUpdates()
{
wxMenuBar* bar = GetMenuBar();
// Process events starting with the window with the focus, if any.
wxWindow* focusWin = wxFindFocusDescendant(this);
if ( bar != NULL ) {
int nCount = bar->GetMenuCount();
for (int n = 0; n < nCount; n++)
DoMenuUpdates(bar->GetMenu(n), focusWin);
DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);
}
}
// update a menu and all submenus recursively
void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
{
wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
wxEvtHandler* evtHandler = GetEventHandler();
wxNode* node = menu->GetItems().First();
while (node)
{
@@ -66,7 +63,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
}
if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu(), focusWin);
DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
}
node = node->Next();
}