X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f8239de2307c1ed34ae5a98b330748c60ef2b10..9ac71bef070f553f4ecef2c549dba33b10422f06:/src/common/containr.cpp?ds=sidebyside

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index fcd92fc6ac..daf414ce55 100644
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -45,31 +45,59 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winParent = winParent;
 
     m_winLastFocused =
+    m_winTmpDefault =
     m_winDefault = NULL;
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // if we're setting the focus
-    if ( 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 )
     {
-        // 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 )
+        // if we're setting the focus
+        if ( win )
         {
-            win = winParent;
-            winParent = win->GetParent();
+            // find the last _immediate_ child which got focus
+            wxWindow *winParent = win;
+            while ( winParent != m_winParent )
+            {
+                win = winParent;
+                winParent = win->GetParent();
 
-            // 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)
+                // 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.
+                // (under 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"));
         }
     }
 
-    m_winLastFocused = win;
+    // propagate the last focus upwards so that our parent can set focus back
+    // to us if it loses it now and regains later
+    wxWindow *parent = m_winParent->GetParent();
+    if ( parent )
+    {
+        wxChildFocusEvent eventFocus(m_winParent);
+        parent->GetEventHandler()->ProcessEvent(eventFocus);
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -220,7 +248,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 +274,9 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 
     if ( child == m_winDefault )
         m_winDefault = NULL;
+
+    if ( child == m_winTmpDefault )
+        m_winTmpDefault = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -254,8 +285,8 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 
 bool wxControlContainer::DoSetFocus()
 {
-    wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
-               m_winParent->GetHandle());
+    wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
+               (unsigned long)m_winParent->GetHandle());
 
     // If the panel gets the focus *by way of getting it set directly*
     // we move the focus to the first window that can get it.
@@ -306,8 +337,8 @@ bool wxControlContainer::DoSetFocus()
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 {
-    wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x, name: %s"),
-               m_winParent->GetHandle(),
+    wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08lx, name: %s"),
+               (unsigned long)m_winParent->GetHandle(),
                m_winParent->GetName().c_str() );
 
     // If we panel got the focus *by way of getting clicked on*
@@ -331,18 +362,20 @@ bool wxControlContainer::SetFocusToChild()
 bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 {
     wxCHECK_MSG( win, FALSE, _T("wxSetFocusToChild(): invalid window") );
+    wxCHECK_MSG( childLastFocused, FALSE,
+                 _T("wxSetFocusToChild(): NULL child poonter") );
 
     if ( *childLastFocused )
     {
-        // It might happen that the window got reparented or no longer accepts
-        // the focus.
-        if ( (*childLastFocused)->GetParent() == win &&
-             (*childLastFocused)->AcceptsFocusFromKeyboard() )
+        // It might happen that the window got reparented
+        if ( (*childLastFocused)->GetParent() == win )
         {
             wxLogTrace(_T("focus"),
-                       _T("SetFocusToChild() => last child (0x%08x)."),
-                       (*childLastFocused)->GetHandle());
+                       _T("SetFocusToChild() => last child (0x%08lx)."),
+                       (unsigned long)(*childLastFocused)->GetHandle());
 
+            // not SetFocusFromKbd(): we're restoring focus back to the old
+            // window and not setting it as the result of a kbd action
             (*childLastFocused)->SetFocus();
             return TRUE;
         }
@@ -362,11 +395,11 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
         {
             wxLogTrace(_T("focus"),
-                       _T("SetFocusToChild() => first child (0x%08x)."),
-                       child->GetHandle());
+                       _T("SetFocusToChild() => first child (0x%08lx)."),
+                       (unsigned long)child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not
-            child->SetFocus();
+            child->SetFocusFromKbd();
             return TRUE;
         }