diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 17:27:49 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 18:19:58 +0200 |
commit | 9940f077fdfc0c271aa66ad64578ae2236a2ca81 (patch) | |
tree | a52b00f3ba98d78f88a0d2aa5a02605746f8e6c7 /extensions | |
parent | f19a599f6911f5ccd1049228454b6c6c8fd6d5cb (diff) |
add Toggleable as a separate thing to a Button
and inherit ToggleButton from both it and Button
Change-Id: If0e500aca8d0ffa087cb5e2bfc1786372fbff4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.hxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 4 | ||||
-rw-r--r-- | extensions/source/abpilot/typeselectionpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/commonpagesdbp.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.hxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/sanedlg.hxx | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 609918899e0b..028a08413bb0 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -204,7 +204,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG(FinalPage, OnRegister, weld::ToggleButton&, void) + IMPL_LINK_NOARG(FinalPage, OnRegister, weld::Toggleable&, void) { bool bEnable = m_xRegisterName->get_active(); m_xNameLabel->set_sensitive(bEnable); @@ -212,7 +212,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::ToggleButton&, void) + IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::Toggleable&, void) { bool bEmbed = m_xEmbed->get_active(); m_xLocationLabel->set_sensitive(!bEmbed); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 229509cb97fb..6c6c5d69d989 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -62,8 +62,8 @@ namespace abp DECL_LINK(OnEntryNameModified, weld::Entry&, void); DECL_LINK(OnComboNameModified, weld::ComboBox&, void); - DECL_LINK(OnRegister, weld::ToggleButton&, void); - DECL_LINK(OnEmbed, weld::ToggleButton&, void); + DECL_LINK(OnRegister, weld::Toggleable&, void); + DECL_LINK(OnEmbed, weld::Toggleable&, void); bool isValidName() const; void implCheckName(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 29efaf4f4fe7..79cfd5d6b035 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -115,7 +115,7 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_xMacab.get(), AST_MACAB, bHaveMacab ) ); m_aAllTypes.push_back( ButtonItem( m_xOther.get(), AST_OTHER, true ) ); - Link<weld::ToggleButton&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); + Link<weld::Toggleable&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); for (auto const& elem : m_aAllTypes) { if (!elem.m_bVisible) @@ -211,7 +211,7 @@ namespace abp && (AST_INVALID != getSelectedType()); } - IMPL_LINK(TypeSelectionPage, OnTypeSelected, weld::ToggleButton&, rButton, void) + IMPL_LINK(TypeSelectionPage, OnTypeSelected, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index b3878a6bf711..7c908057d642 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -71,7 +71,7 @@ namespace abp // OImportPage overridables virtual bool canAdvance() const override; - DECL_LINK( OnTypeSelected, weld::ToggleButton&, void ); + DECL_LINK( OnTypeSelected, weld::Toggleable&, void ); void selectType( AddressSourceType _eType ); }; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 3aede04224e4..3566e91c5c61 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -367,7 +367,7 @@ namespace dbp implEnableWindows(); } - IMPL_LINK(OMaybeListSelectionPage, OnRadioSelected, weld::ToggleButton&, rButton, void) + IMPL_LINK(OMaybeListSelectionPage, OnRadioSelected, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 6aaac6854eab..1ae74215009a 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -70,7 +70,7 @@ namespace dbp virtual ~OMaybeListSelectionPage() override; protected: - DECL_LINK( OnRadioSelected, weld::ToggleButton&, void ); + DECL_LINK( OnRadioSelected, weld::Toggleable&, void ); // BuilderPage overridables void Activate() override; diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 1987de8d85c5..7cf09af05dd2 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -239,7 +239,7 @@ namespace pcr m_xNoAssignment->set_active(sData.isEmpty()); } - IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, weld::ToggleButton&, rButton, void) + IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, weld::Toggleable&, rButton, void) { DBG_ASSERT(&rButton == m_xNoAssignment.get(), "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index cb45fe05abcc..bf55725382f6 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -55,7 +55,7 @@ namespace pcr sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, weld::TreeIter& rContainerEntry); DECL_LINK(OnEntrySelected, weld::TreeView&, void); - DECL_LINK(OnNoAssignmentClicked, weld::ToggleButton&, void); + DECL_LINK(OnNoAssignmentClicked, weld::Toggleable&, void); }; } // namespace pcr diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 06a508d6f860..7dc78017ced8 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -617,7 +617,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, weld::Button&, rButton, void ) } } -IMPL_LINK( SaneDlg, ToggleBtnHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SaneDlg, ToggleBtnHdl, weld::Toggleable&, rButton, void ) { if( mrSane.IsOpen() ) { diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index f467cdd1f6f8..e9ba1540dab5 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -75,7 +75,7 @@ private: std::unique_ptr<weld::CustomWeld> mxPreviewWnd; DECL_LINK( ClickBtnHdl, weld::Button&, void ); - DECL_LINK( ToggleBtnHdl, weld::ToggleButton&, void ); + DECL_LINK( ToggleBtnHdl, weld::Toggleable&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( MetricValueModifyHdl, weld::MetricSpinButton&, void ); |