Further wxUniv fixes

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 6f28387b898cbb5f1e42a997ff6e4a1ee4b5bf81..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
 
 // 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
     #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif


@@ -27,8 +27,12 @@
 
 #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__
+#if defined(__WXMSW__) && !wxUSE_MFC

     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif
     #include <windows.h>
     #include "wx/msw/winundef.h"
 #endif