no need to expand the hidden root (in fact, it is forbidden now)

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 57c9361752f5b8e1059f0ed99221b723d993b56e..90a20eb8337dfb5a73a95daa1f7595dde1638ddb 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,19 +50,43 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win )
+    // the panel itself should never get the focus at all but if it does happen
+    // temporarily (as it seems to do under wxGTK), at the very least don't
+    // forget our previous m_winLastFocused
+    if ( win == m_winParent )
+        return;
+
+    // if we're setting the focus
+    if ( win )
     {
-        wxWindow *winParent = win->GetParent();
-        if ( winParent == m_winParent )
-            break;
+        // find the last _immediate_ child which got focus but be prepared to
+        // handle the case when win == m_winParent as well
+        wxWindow *winParent = win;
+        while ( winParent != m_winParent )
+        {
+            win = winParent;
+            winParent = win->GetParent();
 
-        win = winParent;
-    }
+            // Yes, this can happen, though in a totally pathological case.
+            // like when detaching a menubar from a frame with a child which
+            // has pushed itself as an event handler for the menubar.  (wxGtk)
 
-    wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+            wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }
+    }
 
     m_winLastFocused = win;
+
+    if ( win )
+    {
+        wxLogTrace(_T("focus"), _T("Set last focus to %s(%s)"),
+                   win->GetClassInfo()->GetClassName(),
+                   win->GetLabel().c_str());
+    }
+    else
+    {
+        wxLogTrace(_T("focus"), _T("No more last focus"));
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -213,7 +237,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // everything is simple: just give focus to it
-                child->SetFocus();
+                child->SetFocusFromKbd();
 
                 m_winLastFocused = child;
             }
@@ -336,7 +360,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        _T("SetFocusToChild() => last child (0x%08x)."),
                        (*childLastFocused)->GetHandle());
 
-            (*childLastFocused)->SetFocus();
+            (*childLastFocused)->SetFocusFromKbd();
             return TRUE;
         }
         else
@@ -359,7 +383,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not
-            child->SetFocus();
+            child->SetFocusFromKbd();
             return TRUE;
         }