diff options
| -rw-r--r-- | vcl/inc/salvtables.hxx | 28 | ||||
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 88 |
2 files changed, 66 insertions, 50 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 562621251215..b8a71e08f917 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -1763,4 +1763,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; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7470800b28d8..06d8c8f89533 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2759,65 +2759,53 @@ IMPL_LINK(SalInstanceLinkButton, ClickHdl, FixedHyperlink&, rButton, void) m_aOrigClickHdl.Call(rButton); } -namespace -{ -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) |