diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2020-12-30 12:15:50 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-01-19 15:57:09 +0100 |
commit | 871a723ca41d79798b386bf3ec2c6faab3635e41 (patch) | |
tree | 58b1b5ea110c8980f03d66073b1b87bdb5759086 | |
parent | ba9704b24b382fefd35a66a5dbf81d05c1498cbd (diff) |
Move SalInstanceRadioButton decl to header file
Change-Id: Ic99187477459d424e9c731a29b41a8f06d598864
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109608
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
-rw-r--r-- | include/vcl/salvtables.hxx | 28 | ||||
-rw-r--r-- | vcl/source/app/salvtables.cxx | 97 |
2 files changed, 72 insertions, 53 deletions
diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx index c46f1a0668f1..498cd1c6d94e 100644 --- a/include/vcl/salvtables.hxx +++ b/include/vcl/salvtables.hxx @@ -1511,4 +1511,32 @@ public: virtual ~SalInstanceIconView() override; }; +class SalInstanceRadioButton : public SalInstanceButton, public virtual weld::RadioButton +{ +private: + VclPtr<::RadioButton> m_xRadioButton; + + DECL_LINK(ToggleHdl, ::RadioButton&, void); + +public: + SalInstanceRadioButton(::RadioButton* pButton, SalInstanceBuilder* pBuilder, + bool bTakeOwnership); + + virtual void set_active(bool active) override; + + virtual bool get_active() const override; + + virtual void set_image(VirtualDevice* pDevice) override; + + virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override; + + virtual void set_from_icon_name(const OUString& rIconName) override; + + virtual void set_inconsistent(bool /*inconsistent*/) override; + + virtual bool get_inconsistent() const override; + + virtual ~SalInstanceRadioButton() override; +}; + #endif diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 844e36775ea8..4450ca3d1ee2 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2669,68 +2669,59 @@ IMPL_LINK(SalInstanceLinkButton, ClickHdl, FixedHyperlink&, rButton, void) m_aOrigClickHdl.Call(rButton); } -class SalInstanceRadioButton : public SalInstanceButton, public virtual weld::RadioButton +SalInstanceRadioButton::SalInstanceRadioButton(::RadioButton* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : SalInstanceButton(pButton, pBuilder, bTakeOwnership) + , m_xRadioButton(pButton) { -private: - VclPtr<::RadioButton> m_xRadioButton; - - DECL_LINK(ToggleHdl, ::RadioButton&, void); - -public: - SalInstanceRadioButton(::RadioButton* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceButton(pButton, pBuilder, bTakeOwnership) - , m_xRadioButton(pButton) - { - m_xRadioButton->SetToggleHdl(LINK(this, SalInstanceRadioButton, ToggleHdl)); - } + m_xRadioButton->SetToggleHdl(LINK(this, SalInstanceRadioButton, ToggleHdl)); +} - virtual void set_active(bool active) override - { - disable_notify_events(); - m_xRadioButton->Check(active); - enable_notify_events(); - } +void SalInstanceRadioButton::set_active(bool active) +{ + disable_notify_events(); + m_xRadioButton->Check(active); + enable_notify_events(); +} - virtual bool get_active() const override - { - return m_xRadioButton->IsChecked(); - } +bool SalInstanceRadioButton::get_active() const +{ + return m_xRadioButton->IsChecked(); +} - virtual void set_image(VirtualDevice* pDevice) override - { - m_xRadioButton->SetImageAlign(ImageAlign::Center); - if (pDevice) - m_xRadioButton->SetModeImage(createImage(*pDevice)); - else - m_xRadioButton->SetModeImage(Image()); - } +void SalInstanceRadioButton::set_image(VirtualDevice* pDevice) +{ + m_xRadioButton->SetImageAlign(ImageAlign::Center); + if (pDevice) + m_xRadioButton->SetModeImage(createImage(*pDevice)); + else + m_xRadioButton->SetModeImage(Image()); +} - virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) override - { - m_xRadioButton->SetImageAlign(ImageAlign::Center); - m_xRadioButton->SetModeImage(Image(rImage)); - } +void SalInstanceRadioButton::set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) +{ + m_xRadioButton->SetImageAlign(ImageAlign::Center); + m_xRadioButton->SetModeImage(Image(rImage)); +} - virtual void set_from_icon_name(const OUString& rIconName) override - { - m_xRadioButton->SetModeRadioImage(Image(StockImage::Yes, rIconName)); - } +void SalInstanceRadioButton::set_from_icon_name(const OUString& rIconName) +{ + m_xRadioButton->SetModeRadioImage(Image(StockImage::Yes, rIconName)); +} - virtual void set_inconsistent(bool /*inconsistent*/) override - { - //not available - } +void SalInstanceRadioButton::set_inconsistent(bool /*inconsistent*/) +{ + //not available +} - virtual bool get_inconsistent() const override - { - return false; - } +bool SalInstanceRadioButton::get_inconsistent() const +{ + return false; +} - virtual ~SalInstanceRadioButton() override - { - m_xRadioButton->SetToggleHdl(Link<::RadioButton&, void>()); - } -}; +SalInstanceRadioButton::~SalInstanceRadioButton() +{ + m_xRadioButton->SetToggleHdl(Link<::RadioButton&, void>()); +} IMPL_LINK_NOARG(SalInstanceRadioButton, ToggleHdl, ::RadioButton&, void) { |