Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index df5e79718657521c89e06f1f490b79f8f1694f73..0bfccf8d0dc86c1ab673e771f7f643bd3926e2b9 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -14,7 +14,7 @@
 
 // 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(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__)
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
@@ -27,9 +27,13 @@
 
 #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
-#ifdef __WXMSW__
-//    #include <windows.h>
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif