Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 (#9676)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-01 15:49:44 +00:00
parent 397e7f9829
commit 48fbe8ee0c
1 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/msw/radiobut.cpp
View File

@@ -157,24 +157,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 )
{
// If another radiobutton in the group currently has the focus, we have to
// set it to this radiobutton, else the old readiobutton will be reselected
// automatically, if a parent window loses the focus and regains it.
bool shouldSetFocus = false;
wxWindow* pFocusWnd = FindFocus();
//
// moreover, if another radiobutton in the group currently has the focus,
// we have to set it to this radiobutton, else the old readiobutton will be
// reselected automatically, if a parent window loses the focus and regains
// it.
wxWindow * const focus = 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) )
{
@@ -185,16 +201,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 == pFocusWnd)
if ( btn == focus )
shouldSetFocus = true;
else if ( btn == focusInTLW )
shouldSetTLWFocus = true;
btn->SetValue(false);
@@ -206,7 +229,6 @@ void wxRadioButton::SetValue(bool value)
}
}
}
}
// ... and also turn off all buttons after this one
for ( wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();
@@ -216,23 +238,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 == pFocusWnd)
if ( btn == focus )
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