fixing osx_cocoa

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 29756da6960d4e1bd0f2217e81767aa8e3af0f8f..2fda844c9620a456882a0212a4857535c6624edb 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -472,18 +472,21 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
                 // looping inside this panel (normally, the focus will go to
                 // the next/previous item after this panel in the parent
                 // panel).
                 // looping inside this panel (normally, the focus will go to
                 // the next/previous item after this panel in the parent
                 // panel).

-                wxWindow *focussed_child_of_parent = m_winParent;
+                wxWindow *focusedParent = m_winParent;

                 while ( parent )
                 {
                 while ( parent )
                 {

-                    // we don't want to tab into a different dialog or frame
-                    if ( focussed_child_of_parent->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;
 
                         break;
 

-                    event.SetCurrentFocus( focussed_child_of_parent );
+                    event.SetCurrentFocus( focusedParent );

                     if ( parent->GetEventHandler()->ProcessEvent( event ) )
                         return;
 
                     if ( parent->GetEventHandler()->ProcessEvent( event ) )
                         return;
 

-                    focussed_child_of_parent = parent;
+                    focusedParent = parent;

 
                     parent = parent->GetParent();
                 }
 
                     parent = parent->GetParent();
                 }