[Libreoffice-commits] core.git: include/vcl

[Caolán McNamara (via logerrit)]

 include/vcl/button.hxx         |    6 ------
 include/vcl/toolkit/button.hxx |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit db0824cb3b90b5e5b24601edcd496afd38db71e3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 9 20:53:00 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 10 22:13:15 2020 +0200

    move CloseButton to be toolkit-only
    
    Change-Id: I1f155f539f0f8b8db28d17a073ea25d398c429ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93897
    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 97fc939e9c1e..6f4231f7c473 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -247,12 +247,6 @@ public:
     virtual void    Click() override;
 };
 
-class CloseButton final : public CancelButton
-{
-public:
-    explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0);
-};
-
 class VCL_DLLPUBLIC RadioButton : public Button
 {
 private:
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index d2ec4d2ceb0c..6f8910e435a9 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -24,6 +24,12 @@
 
 #include <vcl/button.hxx>
 
+class CloseButton final : public CancelButton
+{
+public:
+    explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0);
+};
+
 class VCL_DLLPUBLIC HelpButton : public PushButton
 {
 protected: