summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-05 20:59:42 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-02-06 12:16:52 +0100
commit6245dba005eb35525886d16856b6e8cde9ddb105 (patch)
tree9455d3f07c35cfa9a8a46a6ce15111b8a72c1cf2 /include
parent69c546e1e7a697217f273baa7c1729ff823efd76 (diff)
move MenuButton to vcl/toolkit
Change-Id: I3f228c36e3f35ba54cab2ee87fcfbbae7992668d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107265 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/toolkit/menubtn.hxx (renamed from include/vcl/menubtn.hxx)9
-rw-r--r--include/vcl/toolkit/morebtn.hxx5
2 files changed, 6 insertions, 8 deletions
diff --git a/include/vcl/menubtn.hxx b/include/vcl/toolkit/menubtn.hxx
index f32270161b8d..aecb6b04b468 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/toolkit/menubtn.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_MENUBTN_HXX
-#define INCLUDED_VCL_MENUBTN_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include <config_options.h>
#include <vcl/button.hxx>
@@ -91,6 +94,4 @@ public:
};
-#endif // INCLUDED_VCL_MENUBTN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index b0648f443985..0195a996d7c5 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_MOREBTN_HXX
-#define INCLUDED_VCL_MOREBTN_HXX
+#pragma once
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
#error "don't use this in new code"
@@ -54,6 +53,4 @@ public:
using PushButton::SetState;
};
-#endif // INCLUDED_VCL_MOREBTN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */