[Libreoffice-commits] .: toolkit/source vcl/source vcl/win

Fridrich Strba fridrich at kemper.freedesktop.org
Mon Mar 28 00:44:59 PDT 2011 

 toolkit/source/awt/vclxtoolkit.cxx    |    4 ++++
 toolkit/source/awt/vclxtopwindow.cxx  |    4 +---
 toolkit/source/awt/vclxwindow1.cxx    |    3 ++-
 vcl/source/app/settings.cxx           |    1 +
 vcl/source/app/svmain.cxx             |    1 +
 vcl/source/glyphs/graphite_layout.cxx |    4 +---
 vcl/win/inc/svsys.h                   |    5 +++++
 vcl/win/source/app/saldata.cxx        |    2 +-
 vcl/win/source/app/salinst.cxx        |    2 +-
 vcl/win/source/app/salshl.cxx         |    2 +-
 vcl/win/source/app/saltimer.cxx       |    2 +-
 vcl/win/source/gdi/salbmp.cxx         |    2 +-
 vcl/win/source/gdi/salgdi.cxx         |    2 +-
 vcl/win/source/gdi/salgdi2.cxx        |    2 +-
 vcl/win/source/gdi/salgdi3.cxx        |    2 +-
 vcl/win/source/gdi/salgdi_gdiplus.cxx |    2 +-
 vcl/win/source/gdi/salprn.cxx         |    2 +-
 vcl/win/source/gdi/salvd.cxx          |    2 +-
 vcl/win/source/gdi/winlayout.cxx      |    2 +-
 vcl/win/source/window/salframe.cxx    |    2 +-
 vcl/win/source/window/salmenu.cxx     |    2 +-
 vcl/win/source/window/salobj.cxx      |    2 +-
 22 files changed, 30 insertions(+), 22 deletions(-)

New commits:
commit c08d7aae49103176d127d26ee0ede3e53ce5881d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Mar 28 01:31:21 2011 -0600

    Temporarily put back prewin.h/postwin.h hack in tools and vcl

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index be69153..928751b 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -34,6 +34,10 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <stdio.h>
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#endif
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 5e92b39..01e70ee 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/awt/SystemDependentXWindow.hpp>
 
-#ifdef WNT
-#include <windows.h>
-#elif defined ( QUARTZ )
+#if defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 5b259dd..23264e5 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -37,7 +37,8 @@
 #include <vcl/window.hxx>
 
 #ifdef WNT
-#include <windows.h>
+#include <prewin.h>
+#include <postwin.h>
 #elif defined ( QUARTZ )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a42115a..c479315 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+#include <svsys.h>
 #include "tools/debug.hxx"
 #include "i18npool/mslangid.hxx"
 #include "vcl/svapp.hxx"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 3f7b6a9..655bb03 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_vcl.hxx"
 
 #ifdef WNT
+#include <svsys.h>
 #include <process.h>    // for _beginthreadex
 #include <ole2.h>   // for _beginthreadex
 #endif
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 9a3cb27..02e9cea 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -53,9 +53,7 @@
 #include <deque>
 
 // Platform
-#ifdef WNT
-#include <windows.h>
-#endif
+#include <svsys.h>
 
 #include <vcl/salgdi.hxx>
 
diff --git a/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h
index 763ea49..c3d07f2 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/win/inc/svsys.h
@@ -29,6 +29,11 @@
 #ifndef _SV_SVSYS_H
 #define _SV_SVSYS_H
 
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#endif
+
 #endif // _SV_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 44ec229..5eb8906 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include "rtl/tencinfo.h"
 #include <saldata.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 5d89b51..5af481d 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #ifdef WNT
-#include <windows.h>
+#include <svsys.h>
 #include <process.h>
 #endif
 #ifdef __MINGW32__
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index cf9b76f..9f015b0 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <saldata.hxx>
 #include <tools/debug.hxx>
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 040bae9..1626f22 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 481210d..75215a5 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <vcl/salbtype.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index dfa0979..07f964f 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 7602de4..2cab0c8 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <windows.h>
+#include <svsys.h>
 #include <tools/debug.hxx>
 #include <wincomp.hxx>
 #include <salbmp.h>
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 4973eaf..024a13e 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -33,7 +33,7 @@
 #include <malloc.h>
 
 #include <vcl/sysdata.hxx>
-#include <windows.h>
+#include <svsys.h>
 
 #include "wincomp.hxx"
 #include "saldata.hxx"
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 4165698..b7b9d96 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salgdi.h>
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index bec0ab6..a079ce5 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -32,7 +32,7 @@
 #define WINVER 0x0500
 
 #include <string.h>
-#include <windows.h>
+#include <svsys.h>
 
 #ifdef __MINGW32__
 #include <excpt.h>
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index edfff21..37c3e91 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index d5a7acd..b1fc932 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <windows.h>
+#include <svsys.h>
 
 #include "salgdi.h"
 #include "saldata.hxx"
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 623440b..4ee94b3 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -47,7 +47,7 @@
 
 #include <stdio.h>
 
-#include <windows.h>
+#include <svsys.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index a5cc4c4..c39ff1c 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 51d0123..d8c7a1b 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -31,7 +31,7 @@
 
 #include <string.h>
 
-#include <windows.h>
+#include <svsys.h>
 #include <wincomp.hxx>
 #include <saldata.hxx>
 #include <salinst.h>

More information about the Libreoffice-commits mailing list