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

Fix bug with having multiple default buttons in wxMSW dialogs

Browse Source 
We need to reset the default button using DM_SETDEFID too, otherwise
calling DM_SETDEFID later, when setting the new default button, seems to
restore BS_DEFPUSHBUTTON on the previous default button (but only if its
ID is positive, which probably explains why this bug went unnoticed for
so long), resulting in having 2 buttons with BS_DEFPUSHBUTTON in the
dialog.

Closes #19245.

This commit is best viewed ignoring whitespace-only changes.
This commit is contained in:
Vadim Zeitlin
2021-08-19 18:10:36 +01:00
parent 7501deb5fe
commit 214381c0cd
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/button.cpp
View File

@@ -222,8 +222,8 @@ wxSize wxButtonBase::GetDefaultSize(wxWindow* win)
and the current control doesn't process Enter itself somehow. This is and the current control doesn't process Enter itself somehow. This is
handled by ::DefWindowProc() (or maybe ::DefDialogProc()) using DM_SETDEFID handled by ::DefWindowProc() (or maybe ::DefDialogProc()) using DM_SETDEFID
Another aspect of "defaultness" is that the default button has different Another aspect of "defaultness" is that the default button has different
appearance: this is due to BS_DEFPUSHBUTTON style which is completely appearance: this is due to BS_DEFPUSHBUTTON style which is only partially
separate from DM_SETDEFID stuff (!). Also note that BS_DEFPUSHBUTTON should handled by using DM_SETDEFID. Also note that BS_DEFPUSHBUTTON should
be unset if our parent window is not active so it should be unset whenever be unset if our parent window is not active so it should be unset whenever
we lose activation and set back when we regain it. we lose activation and set back when we regain it.
@@ -330,22 +330,21 @@ wxButton::SetDefaultStyle(wxButton *btn, bool on)
if ( !btn ) if ( !btn )
return; return;
// we shouldn't set BS_DEFPUSHBUTTON for any button if we don't have
// focus at all any more
if ( on && !wxTheApp->IsActive() )
return;
// first, let DefDlgProc() know about the new default button // first, let DefDlgProc() know about the new default button
if ( on ) wxWindow * const tlw = wxGetTopLevelParent(btn);
{ wxCHECK_RET( tlw, wxT("button without top level window?") );
// we shouldn't set BS_DEFPUSHBUTTON for any button if we don't have
// focus at all any more
if ( !wxTheApp->IsActive() )
return;
wxWindow * const tlw = wxGetTopLevelParent(btn); // passing -1 to indicate absence of the default button is not documented
wxCHECK_RET( tlw, wxT("button without top level window?") ); // as being supported, but we need to pass something to DM_SETDEFID when
// resetting the default button it in order to prevent DefDlgProc() from
::SendMessage(GetHwndOf(tlw), DM_SETDEFID, btn->GetId(), 0L); // restoring BS_DEFPUSHBUTTON on it later, see #19245, and -1 shouldn't
// conflict with anything, as it can never be a valid ID
// sending DM_SETDEFID also changes the button style to ::SendMessage(GetHwndOf(tlw), DM_SETDEFID, on ? btn->GetId() : -1, 0L);
// BS_DEFPUSHBUTTON so there is nothing more to do
}
// then also change the style as needed // then also change the style as needed
long style = ::GetWindowLong(GetHwndOf(btn), GWL_STYLE); long style = ::GetWindowLong(GetHwndOf(btn), GWL_STYLE);