X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f8e5072f7391db2158f44c6b9209bbb3db6eb06..4bc1afd502a0f6f31bddb349a63f41a828f54ded:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index a1a2a865e0..0bfccf8d0d 100644
--- 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,6 +27,10 @@
 
 #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
 #if defined(__WXMSW__) && !wxUSE_MFC
     #include <windows.h>