diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-07-12 17:22:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-12 20:28:56 +0200 |
commit | bcea211b66910ee6cf6a51e4baa950b3f897e310 (patch) | |
tree | b642d3acecade37f7ea5530e36d5d248e6b31c5e /sfx2 | |
parent | fcadbd72c14b9337cb11e4afb5143bff44a83646 (diff) |
move CheckBox to toolkit-only headers
Change-Id: Id1b2dd11bd0ebd9c88cf7e86d990a1990d760b2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98605
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sidebar/ControlFactory.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sidebar/MenuButton.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/ControlFactory.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/MenuButton.cxx | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/sfx2/inc/sidebar/ControlFactory.hxx b/sfx2/inc/sidebar/ControlFactory.hxx index 15ae45ef4c81..22fd2fdeb119 100644 --- a/sfx2/inc/sidebar/ControlFactory.hxx +++ b/sfx2/inc/sidebar/ControlFactory.hxx @@ -22,7 +22,6 @@ #include <sfx2/dllapi.h> #include <vcl/vclptr.hxx> -class CheckBox; class RadioButton; namespace vcl { class Window; } @@ -38,7 +37,7 @@ class ControlFactory public: /** Create the menu button for the task bar. */ - static VclPtr<CheckBox> CreateMenuButton (vcl::Window* pParentWindow); + static VclPtr<RadioButton> CreateMenuButton (vcl::Window* pParentWindow); static VclPtr<RadioButton> CreateTabItem (vcl::Window* pParentWindow); }; diff --git a/sfx2/inc/sidebar/MenuButton.hxx b/sfx2/inc/sidebar/MenuButton.hxx index a244a3439738..eab32a463b64 100644 --- a/sfx2/inc/sidebar/MenuButton.hxx +++ b/sfx2/inc/sidebar/MenuButton.hxx @@ -23,7 +23,7 @@ namespace sfx2::sidebar { class MenuButton final - : public CheckBox + : public RadioButton { public: MenuButton (vcl::Window* pParentWindow); @@ -34,7 +34,7 @@ public: virtual void MouseButtonUp (const MouseEvent& rMouseEvent) override; protected: - using CheckBox::FillLayoutData; + using RadioButton::FillLayoutData; private: bool mbIsLeftButtonDown; diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index d2d3d27dde32..e310e2b9012a 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -23,7 +23,7 @@ namespace sfx2::sidebar { -VclPtr<CheckBox> ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) +VclPtr<RadioButton> ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) { return VclPtr<MenuButton>::Create(pParentWindow); } diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index 36be7fcfc2e3..364f0b89d6af 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -29,7 +29,7 @@ using namespace css::uno; namespace sfx2::sidebar { MenuButton::MenuButton (vcl::Window* pParentWindow) - : CheckBox(pParentWindow), + : RadioButton(pParentWindow), mbIsLeftButtonDown(false) { #ifdef DEBUG @@ -63,7 +63,7 @@ void MenuButton::MouseMove (const MouseEvent& rEvent) { if (rEvent.IsEnterWindow() || rEvent.IsLeaveWindow()) Invalidate(); - CheckBox::MouseMove(rEvent); + RadioButton::MouseMove(rEvent); } void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent) |