X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f8239de2307c1ed34ae5a98b330748c60ef2b10..41fecb4451682f11e352fc5b9b7383f6335322a7:/src/common/containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index fcd92fc6ac..624382ff28 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -45,11 +45,18 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winParent = winParent;
 
     m_winLastFocused =
+    m_winTmpDefault =
     m_winDefault = NULL;
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *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 )
     {
@@ -65,11 +72,22 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
             // 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( winParent, _T("Setting last focus for a window that is not our 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"));
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -220,7 +238,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;
             }
@@ -246,6 +264,9 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 
     if ( child == m_winDefault )
         m_winDefault = NULL;
+
+    if ( child == m_winTmpDefault )
+        m_winTmpDefault = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -343,7 +364,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        _T("SetFocusToChild() => last child (0x%08x)."),
                        (*childLastFocused)->GetHandle());
 
-            (*childLastFocused)->SetFocus();
+            (*childLastFocused)->SetFocusFromKbd();
             return TRUE;
         }
         else
@@ -366,7 +387,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not
-            child->SetFocus();
+            child->SetFocusFromKbd();
             return TRUE;
         }