diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-28 01:31:21 -0600 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-28 09:44:37 +0200 |
| commit | a18b02e8a3278f1c1b7a505d0551d9254913bfe0 (patch) | |
| tree | 7a74bd23d1b8e270b66a944773e348dc7e8f5663 /toolkit | |
| parent | 273e5b1f522a56ae74559eb2d404ecf53c9a2428 (diff) | |
Temporarily put back prewin.h/postwin.h hack in tools and vcl
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index dacd5156d69c..a8cf619f21bf 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 94513645bc8f..abcf616a2a90 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 186b65c3d68f..3039e11c3895 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> |