change not only the focus but also last remembered TLW focus in SetValue() to avoid focus being reset to the wrong radio button when TLW regains activation [backport of r54453 and r54454 from trunk] (closes #9676)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/radiobut.cpp

@@ -31,6 +31,7 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcscreen.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -153,24 +154,40 @@ bool wxRadioButton::Create(wxWindow *parent,
 
 void wxRadioButton::SetValue(bool value)
 {
-    (void)::SendMessage(GetHwnd(), BM_SETCHECK, (value?BST_CHECKED:BST_UNCHECKED), 0L);
+    ::SendMessage(GetHwnd(), BM_SETCHECK,
+                  value ? BST_CHECKED : BST_UNCHECKED, 0);
 
     m_isChecked = value;
 
+    if ( !value )
+        return;
+
     // if we set the value of one radio button we also must clear all the other
     // buttons in the same group: Windows doesn't do it automatically
-    if ( m_isChecked )
+    //
-    {
+    // moreover, if another radiobutton in the group currently has the focus,
-        // If another radiobutton in the group currently has the focus, we have to
+    // we have to set it to this radiobutton, else the old radiobutton will be
-        // set it to this radiobutton, else the old radiobutton will be reselected
+    // reselected automatically, if a parent window loses the focus and regains
-        // automatically, if a parent window loses the focus and regains it.
+    // it.
-        bool shouldSetFocus = false;
+    wxWindow * const focus = FindFocus();
-        wxWindow* pFocusWnd = FindFocus();
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    wxCHECK_RET( tlw, _T("radio button outside of TLW?") );
+    wxWindow * const focusInTLW = tlw->GetLastFocus();
 
     const wxWindowList& siblings = GetParent()->GetChildren();
     wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);
     wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") );
 
+    // this will be set to true in the code below if the focus is in our TLW
+    // and belongs to one of the other buttons in the same group
+    bool shouldSetFocus = false;
+
+    // this will be set to true if the focus is outside of our TLW currently
+    // but the remembered focus of this TLW is one of the other buttons in the
+    // same group
+    bool shouldSetTLWFocus = false;
+
     // if it's not the first item of the group ...
     if ( !HasFlag(wxRB_GROUP) )
     {
@@ -181,16 +198,23 @@ void wxRadioButton::SetValue(bool value)
         {
             wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
                                                wxRadioButton);
-                if ( btn && btn->HasFlag(wxRB_SINGLE) )
+            if ( !btn )
+            {
+                // don't stop on non radio buttons, we could have intermixed
+                // buttons and e.g. static labels
+                continue;
+            }
+
+            if ( btn->HasFlag(wxRB_SINGLE) )
                 {
                     // A wxRB_SINGLE button isn't part of this group
                     break;
                 }
 
-                if (btn)
+            if ( btn == focus )
-                {
-                    if (btn == pFocusWnd)
                 shouldSetFocus = true;
+            else if ( btn == focusInTLW )
+                shouldSetTLWFocus = true;
 
             btn->SetValue(false);
 
@@ -202,7 +226,6 @@ void wxRadioButton::SetValue(bool value)
             }
         }
     }
-        }
 
     // ... and also turn off all buttons after this one
     for ( wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();
@@ -212,23 +235,27 @@ void wxRadioButton::SetValue(bool value)
         wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(),
                                            wxRadioButton);
 
-            if ( btn && (btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) ) )
+        if ( !btn )
+            continue;
+
+        if ( btn->HasFlag(wxRB_GROUP | wxRB_SINGLE) )
         {
             // no more buttons or the first button of the next group
             break;
         }
 
-            if (btn)
+        if ( btn == focus )
-            {
-                if (btn == pFocusWnd)
             shouldSetFocus = true;
+        else if ( btn == focusInTLW )
+            shouldSetTLWFocus = true;
 
         btn->SetValue(false);
     }
-        }
+
-        if (shouldSetFocus)
+    if ( shouldSetFocus )
         SetFocus();
-    }
+    else if ( shouldSetTLWFocus )
+        tlw->SetLastFocus(this);
 }
 
 bool wxRadioButton::GetValue() const