summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-13 15:58:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-20 20:24:32 +0200
commit4a231d1fc13fa13ec48e7d41d0a8c59a2527a3f4 (patch)
tree7dad1962b0d4c24d39a39f1a70fe80ef665865e4 /include/vcl
parent68d161c6803654f4ce816af7e79371a2d3497b4f (diff)
move ComboBox to toolkit-only headers
Change-Id: If5f0ab1fba8fa7302b7c0e8d2b25761ab64c97e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94143 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/toolkit/combobox.hxx (renamed from include/vcl/combobox.hxx)4
-rw-r--r--include/vcl/toolkit/field.hxx2
2 files changed, 5 insertions, 1 deletions
diff --git a/include/vcl/combobox.hxx b/include/vcl/toolkit/combobox.hxx
index ee5f72bcad8d..81bd8c2dfc57 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/toolkit/combobox.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_COMBOBOX_HXX
#define INCLUDED_VCL_COMBOBOX_HXX
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
+
#include <memory>
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index ce3f1277e862..e78b174e74a5 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -25,7 +25,7 @@
#endif
#include <config_options.h>
-#include <vcl/combobox.hxx>
+#include <vcl/toolkit/combobox.hxx>
#include <vcl/field.hxx>
#include <vcl/longcurr.hxx>