diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-18 11:07:02 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-12 10:39:14 +0200 |
commit | 4da268f62af7af84a6d20062db6d07103442861c (patch) | |
tree | 239ddabfc77188fc48cca877da63067ebda32f67 /vcl | |
parent | 2f72c9d716d930479697c19a50c0a1b6e0b665d7 (diff) |
Move SalInstanceCheckButton to header file
Change-Id: Id6597cd259abefe69a61f0ab414c6bd2114c9749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93977
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/salvtables.hxx | 20 | ||||
-rw-r--r-- | vcl/source/app/salvtables.cxx | 70 |
2 files changed, 51 insertions, 39 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 2ab561f480a0..f7776b3ff848 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -711,4 +711,24 @@ public: virtual weld::Container* weld_message_area() override; }; +class SalInstanceCheckButton : public SalInstanceButton, public virtual weld::CheckButton +{ +private: + VclPtr<CheckBox> m_xCheckButton; + + DECL_LINK(ToggleHdl, CheckBox&, void); +public: + SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + + virtual void set_active(bool active) override; + + virtual bool get_active() const override; + + virtual void set_inconsistent(bool inconsistent) override; + + virtual bool get_inconsistent() const override; + + virtual ~SalInstanceCheckButton() override; +}; + #endif
\ No newline at end of file diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index c43e6bb9c462..96de2ec3b213 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1441,51 +1441,43 @@ IMPL_LINK(SalInstanceToggleButton, ToggleListener, VclWindowEvent&, rEvent, void signal_toggled(); } -class SalInstanceCheckButton : public SalInstanceButton, public virtual weld::CheckButton +SalInstanceCheckButton::SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : SalInstanceButton(pButton, pBuilder, bTakeOwnership) + , m_xCheckButton(pButton) { -private: - VclPtr<CheckBox> m_xCheckButton; - - DECL_LINK(ToggleHdl, CheckBox&, void); -public: - SalInstanceCheckButton(CheckBox* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceButton(pButton, pBuilder, bTakeOwnership) - , m_xCheckButton(pButton) - { - m_xCheckButton->SetToggleHdl(LINK(this, SalInstanceCheckButton, ToggleHdl)); - } + m_xCheckButton->SetToggleHdl(LINK(this, SalInstanceCheckButton, ToggleHdl)); +} - virtual void set_active(bool active) override - { - disable_notify_events(); - m_xCheckButton->EnableTriState(false); - m_xCheckButton->Check(active); - enable_notify_events(); - } +void SalInstanceCheckButton::set_active(bool active) +{ + disable_notify_events(); + m_xCheckButton->EnableTriState(false); + m_xCheckButton->Check(active); + enable_notify_events(); +} - virtual bool get_active() const override - { - return m_xCheckButton->IsChecked(); - } +bool SalInstanceCheckButton::get_active() const +{ + return m_xCheckButton->IsChecked(); +} - virtual void set_inconsistent(bool inconsistent) override - { - disable_notify_events(); - m_xCheckButton->EnableTriState(true); - m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : TRISTATE_FALSE); - enable_notify_events(); - } +void SalInstanceCheckButton::set_inconsistent(bool inconsistent) +{ + disable_notify_events(); + m_xCheckButton->EnableTriState(true); + m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET : TRISTATE_FALSE); + enable_notify_events(); +} - virtual bool get_inconsistent() const override - { - return m_xCheckButton->GetState() == TRISTATE_INDET; - } +bool SalInstanceCheckButton::get_inconsistent() const +{ + return m_xCheckButton->GetState() == TRISTATE_INDET; +} - virtual ~SalInstanceCheckButton() override - { - m_xCheckButton->SetToggleHdl(Link<CheckBox&, void>()); - } -}; +SalInstanceCheckButton::~SalInstanceCheckButton() +{ + m_xCheckButton->SetToggleHdl(Link<CheckBox&, void>()); +} IMPL_LINK_NOARG(SalInstanceCheckButton, ToggleHdl, CheckBox&, void) { |