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

Menu/toolbar event handling now tries the window with the focus first.

Browse Source 
wxTextCtrl processes cut, copy, paste, undo, redo commands and UI updates
automatically.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-04-07 21:33:22 +00:00
parent b59ff3c9c8
commit e702ff0f08
38 changed files with 617 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/framecmn.cpp
View File

@@ -30,16 +30,21 @@ void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
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));
DoMenuUpdates(bar->GetMenu(n), focusWin);
}
}
// update a menu and all submenus recursively
void wxFrame::DoMenuUpdates(wxMenu* menu)
void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
{
wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
wxNode* node = menu->GetItems().First();
while (node)
{
@@ -50,7 +55,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu)
wxUpdateUIEvent event(id);
event.SetEventObject( this );
if (GetEventHandler()->ProcessEvent(event))
if (evtHandler->ProcessEvent(event))
{
if (event.GetSetText())
menu->SetLabel(id, event.GetText());
@@ -61,7 +66,7 @@ void wxFrame::DoMenuUpdates(wxMenu* menu)
}
if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu());
DoMenuUpdates(item->GetSubMenu(), focusWin);
}
node = node->Next();
}