[Libreoffice-commits] core.git: include/vcl
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 29 09:20:53 UTC 2020
include/vcl/button.hxx | 15 ---------------
include/vcl/toolkit/button.hxx | 15 +++++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit df56a000a165da01a14b2fdf2ad66f371a452ce8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 28 20:14:51 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 29 11:20:14 2020 +0200
move ImageButton to toolkit-only headers
Change-Id: I2413d4165f2b1a88c53facbb0993cc6623a28082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 0819ff1b5aab..4c3a7beafa5f 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -335,21 +335,6 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
};
-class VCL_DLLPUBLIC ImageButton final : public PushButton
-{
-protected:
- using PushButton::ImplInitStyle;
-
-private:
- SAL_DLLPRIVATE void ImplInitStyle();
-
- ImageButton( const ImageButton & ) = delete;
- ImageButton & operator= ( const ImageButton & ) = delete;
-
-public:
- ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
-};
-
#endif // INCLUDED_VCL_BUTTON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index cb581a407c59..0c90976cbd70 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -167,4 +167,19 @@ public:
virtual FactoryFunction GetUITestFactory() const override;
};
+class VCL_DLLPUBLIC ImageButton final : public PushButton
+{
+protected:
+ using PushButton::ImplInitStyle;
+
+private:
+ SAL_DLLPRIVATE void ImplInitStyle();
+
+ ImageButton( const ImageButton & ) = delete;
+ ImageButton & operator= ( const ImageButton & ) = delete;
+
+public:
+ ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list