diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-05-30 10:47:12 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-01 19:39:39 +0200 |
| commit | b9c79a4dd4ad58156b60c2e387c0838ba911ab14 (patch) | |
| tree | cfb2e3c3528a7d5896e2bc07fd726b9fdbc25fe1 /vcl | |
| parent | ea79a34ec7ffee6f86f16172c9e5fd75257539ca (diff) | |
Revert "tdf#125609 c10 vcl/button: enforce only one radio selected on init"
This has already been reverted in 6.4.5
with commit 64d7f805616fd781d87b49156860d96f081a5a45.
I want to get out of this completely, because everything keeps
on breaking based on my earlier patches.
This reverts commit d35171456bc230efdaa9426da1398b2db7fa0df8,
and the accompanying
LO 6.4 commit a9f4913f283d34c610c4b73c755fdc828857bfce
"tdf#125609 c14: vcl button: don't modify style directly"
These reverted supporting commits are obsolete.
(They fixed a situation caused by
a commit that has since been fully reverted.
I left these in for the benefit of anyone who
might attempt that initial fix in the future.
But now I want to get my finger prints out of
here completely.)
Change-Id: I0d765ce0cc4ab2b9d282d36a239518d43d6015ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95190
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/button.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index e6d52df0630a..1f9e2573e144 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1789,9 +1789,6 @@ WinBits RadioButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nSty nStyle &= ~WB_TABSTOP; } - if ( IsChecked() && IsRadioCheckEnabled() ) - ImplUncheckAllOther( /*bSetStyle=*/false ); - return nStyle; } @@ -2180,10 +2177,9 @@ std::vector< VclPtr<RadioButton> > RadioButton::GetRadioButtonGroup(bool bInclud return aGroup; } -void RadioButton::ImplUncheckAllOther( const bool bSetStyle ) +void RadioButton::ImplUncheckAllOther() { - if ( bSetStyle ) - mpWindowImpl->mnStyle |= WB_TABSTOP; + mpWindowImpl->mnStyle |= WB_TABSTOP; std::vector<VclPtr<RadioButton> > aGroup(GetRadioButtonGroup(false)); // iterate over radio button group and checked buttons |