compilation fix for compilers not using PCH

[wxWidgets.git] / include / wx / wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index df5e79718657521c89e06f1f490b79f8f1694f73..5e34e7089cdb710fb2a64afef86fa1c890ff8b31 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,14 @@
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH
 
 // check if to use precompiled headers: do it for most Windows compilers unless
 // explicitly disabled by defining NOPCH

-#if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
+#if ( defined(__WXMSW__) && \
+       ( defined(__BORLANDC__)    || \
+         defined(__VISUALC__)     || \
+         defined(__DIGITALMARS__) || \
+         defined(__WATCOMC__) ) ) || \
+      defined(__VISAGECPP__) || \
+      defined(__MWERKS__)
+

     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif


@@ -27,10 +34,13 @@
 
 #ifdef WX_PRECOMP
 
 
 #ifdef WX_PRECOMP
 

+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
+

 // include standard Windows headers
 // include standard Windows headers

-#ifdef __WXMSW__
-//    #include <windows.h>
-    #include "wx/msw/winundef.h"
+#if defined(__WXMSW__)
+    #include "wx/msw/wrapwin.h"

 #endif
 
 // include the most common wx headers
 #endif
 
 // include the most common wx headers