From 5aa54f17441afee8c2001d73f4b590eeeafd7414 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke 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 Reviewed-by: Jochen Nitschke --- include/vcl/menu.hxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include/vcl/menu.hxx') 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)) -- cgit