From 5aa54f17441afee8c2001d73f4b590eeeafd7414 Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Fri, 5 May 2017 15:29:21 +0200
Subject: break circular include

of include/vcl/window.hxx and include/vcl/vclevent.hxx

Change-Id: Iacb3cc942693a732de5899af26e08e0977a83102
Reviewed-on: https://gerrit.libreoffice.org/37338
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
---
 include/vcl/menu.hxx     | 8 ++++++--
 include/vcl/vclevent.hxx | 7 +++++--
 include/vcl/window.hxx   | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index e3a0e8b8c529..ddf12f629c99 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -47,7 +47,6 @@ class PopupMenu;
 class KeyEvent;
 class CommandEvent;
 class MenuFloatingWindow;
-namespace vcl { class Window; }
 class SalMenu;
 class MenuBarWindow;
 struct SystemMenuData;
@@ -57,7 +56,12 @@ namespace com { namespace sun { namespace star { namespace accessibility {
     class XAccessible;
 }}}}
 
-namespace vcl { struct MenuLayoutData; }
+namespace vcl
+{
+class Window;
+struct MenuLayoutData;
+typedef OutputDevice RenderContext; // same as in include/vcl/outdev.hxx
+}
 
 #define MENU_APPEND        (sal_uInt16(0xFFFF))
 #define MENU_ITEM_NOTFOUND (sal_uInt16(0xFFFF))
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index a60723167427..933ce2666fba 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_VCL_VCLEVENT_HXX
 #define INCLUDED_VCL_VCLEVENT_HXX
 
-#include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -35,6 +33,11 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace vcl
+{
+    class Window;
+}
+
 enum class VclEventId
 {
     NONE,
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 36370a7c8137..ac9e1a60b908 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -33,6 +33,7 @@
 #include <vcl/region.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/uitest/factory.hxx>
+#include <vcl/vclevent.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -1548,7 +1549,6 @@ public:
 
 // Only for compatibility - because many people outside haven't included event.hxx
 // These require Window to be defined for VclPtr<Window>
-#include <vcl/vclevent.hxx>
 #include <vcl/event.hxx>
 
 #endif // INCLUDED_VCL_WINDOW_HXX
-- 
cgit