Fix bug with TAB being able to switch focus between MDI frames.

The keyboard navigation code correctly checked that TAB was not propagated
above the TLW containing the window in which the key was pressed to avoid
switching focus between different TLWs by pressing TAB.

However wxMDIChildFrame is not a TLW and so it was possible to switch focus
between two different MDI child frames by pressing TAB. This was unexpected
and counterintuitive, especially because the frame receiving focus was not
even activated (which might be another bug).

Fix this by adding a new wxWindow::IsTopNavigationDomain() virtual method that
can be overridden to indicate that a window is a self-contained "keyboard
navigation domain" and that keyboard events shouldn't propagate outside of it
and override it in both wxTopLevelWindow and wxMDIChildFrame to ensure that it
behaves correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-08-03 00:45:42 +00:00
parent 2a0777a8f0
commit 6e92c2991b
4 changed files with 20 additions and 2 deletions

View File

@@ -475,8 +475,11 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
wxWindow *focusedParent = m_winParent;
while ( parent )
{
// we don't want to tab into a different dialog or frame
if ( focusedParent->IsTopLevel() )
// We don't want to tab into a different dialog or frame or
// even an MDI child frame, so test for this explicitly
// (and in particular don't just use IsTopLevel() which
// would return false in the latter case).
if ( focusedParent->IsTopNavigationDomain() )
break;
event.SetCurrentFocus( focusedParent );