include/vcl/menubtn.hxx | 11 -----------
vcl/inc/menutogglebutton.hxx | 34 ++++++++++++++++++++++++++++++++++
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/menubtn.cxx | 1 +
vcl/source/window/builder.cxx | 1 +
5 files changed, 37 insertions(+), 12 deletions(-)
New commits:
commit 46dd214ab94181d3c552d86ec20b4a2c104fcc48
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 17 21:09:15 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 22 21:07:28 2020 +0200
MenuToggleButton no longer needs to be in public headers
Change-Id: Ifc190ddc0c9b5eb33555dcec5ed14fd9b36134e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104537
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index fef1ad346805..f32270161b8d 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -91,17 +91,6 @@ public:
};
-
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MenuToggleButton final : public
MenuButton
-{
-public:
- explicit MenuToggleButton( vcl::Window* pParent, WinBits nStyle );
- virtual ~MenuToggleButton() override;
-
- void SetActive( bool bSel );
- bool GetActive() const;
-};
-
#endif // INCLUDED_VCL_MENUBTN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/menutogglebutton.hxx b/vcl/inc/menutogglebutton.hxx
new file mode 100644
index 000000000000..e297926822d6
--- /dev/null
+++ b/vcl/inc/menutogglebutton.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <vcl/menubtn.hxx>
+
+class MenuToggleButton final : public MenuButton
+{
+public:
+ explicit MenuToggleButton(vcl::Window* pParent, WinBits nStyle);
+ virtual ~MenuToggleButton() override;
+
+ void SetActive(bool bSel);
+ bool GetActive() const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4ebf0bda3b55..26e382af0536 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -71,7 +71,7 @@
#include <vcl/virdev.hxx>
#include <bitmaps.hlst>
#include <calendar.hxx>
-#include <vcl/menubtn.hxx>
+#include <menutogglebutton.hxx>
#include <verticaltabctrl.hxx>
#include <window.h>
#include <wizdlg.hxx>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 643cf048b84b..a3c1cda1ce8b 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -27,6 +27,7 @@
#include <vcl/uitest/uiobject.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
+#include <menutogglebutton.hxx>
namespace
{
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bea4f8f42390..b708eba955b8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -62,6 +62,7 @@
#include <xmlreader/xmlreader.hxx>
#include <desktop/crashreport.hxx>
#include <calendar.hxx>
+#include <menutogglebutton.hxx>
#include <salinst.hxx>
#include <strings.hrc>
#include <treeglue.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
