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>

2 files changed, 18 insertions, 5 deletions

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 847ac8b62164..e4d42f4bb7c7 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -217,10 +217,10 @@ namespace vcl
         DECL_LINK( FocusOutHdl, weld::Widget&, void );
         DECL_LINK( SpinModifyHdl, weld::SpinButton&, void );
         DECL_LINK( MetricSpinModifyHdl, weld::MetricSpinButton&, void );
-        DECL_LINK( ToggleHdl, weld::ToggleButton&, void );
+        DECL_LINK( ToggleHdl, weld::Toggleable&, void );
 
-        DECL_LINK( UIOption_CheckHdl, weld::ToggleButton&, void );
-        DECL_LINK( UIOption_RadioHdl, weld::ToggleButton&, void );
+        DECL_LINK( UIOption_CheckHdl, weld::Toggleable&, void );
+        DECL_LINK( UIOption_RadioHdl, weld::Toggleable&, void );
         DECL_LINK( UIOption_SelectHdl, weld::ComboBox&, void );
         DECL_LINK( UIOption_SpinModifyHdl, weld::SpinButton&, void );
         DECL_LINK( UIOption_EntryModifyHdl, weld::Entry&, void );
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 207e326e43f5..12a716edcd1c 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1010,6 +1010,9 @@ private:
 
     DECL_LINK(ClickHdl, ::Button*, void);
 
+protected:
+    void set_label_wrap(bool bWrap);
+
 public:
     SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
 
@@ -1021,8 +1024,6 @@ public:
 
     virtual void set_from_icon_name(const OUString& rIconName) override;
 
-    virtual void set_label_wrap(bool wrap) override;
-
     virtual OUString get_label() const override;
 
     virtual void set_font(const vcl::Font& rFont) override;
@@ -1110,6 +1111,12 @@ public:
 
     virtual bool get_inconsistent() const override;
 
+    virtual void set_label(const OUString& rText) override { SalInstanceButton::set_label(rText); }
+
+    virtual OUString get_label() const override { return SalInstanceButton::get_label(); }
+
+    virtual void set_label_wrap(bool wrap) override { SalInstanceButton::set_label_wrap(wrap); }
+
     virtual ~SalInstanceCheckButton() override;
 };
 
@@ -1810,6 +1817,12 @@ public:
 
     virtual bool get_inconsistent() const override;
 
+    virtual void set_label(const OUString& rText) override { SalInstanceButton::set_label(rText); }
+
+    virtual OUString get_label() const override { return SalInstanceButton::get_label(); }
+
+    virtual void set_label_wrap(bool wrap) override { SalInstanceButton::set_label_wrap(wrap); }
+
     virtual ~SalInstanceRadioButton() override;
 };