X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a0777a8f079e4f2991f219dc641de3798143f79..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 910804bc4d..2fda844c96 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -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 );