From 662f03082d3652aa48a218d603dc36ede3da78f4 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 25 May 2009 13:05:01 +0000
Subject: #i10000#: partly undo changes from canvascrairo01 (build problems due
 to redifinition of HINSTANCE)

---
 framework/source/uielement/menubarmanager.cxx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'framework')

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 142844f08670..54e77596970b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -101,12 +101,15 @@
 #include <uielement/menubarmerger.hxx>
 #include <dispatch/uieventloghelper.hxx>
 
-#ifdef WNT
-#include <tools/prewin.h>
-#include <windows.h>
-#include <tools/postwin.h>
-#endif
-#include <vcl/sysdata.hxx>
+// Be careful removing this "bad" construct. There are serious problems
+// with #define STRICT and including windows.h. Changing this needs some
+// redesign on other projects, too. Especially sal/main.h which defines
+// HINSTANCE depending on STRCIT!!!!!!!!!!!!!!!
+struct SystemMenuData
+{
+    unsigned long nSize;
+    long          hMenu;
+};
 
 //_________________________________________________________________________________________________________________
 //  namespace
-- 
cgit