X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cded6e3c281d23fef2aa6be530c9c295a5c017f2..d7eee191c55687785a2be927fd387d10514cdf1b:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 6f28387b89..f8f2e432bc 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,8 +27,16 @@ #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__ +#if defined(__WXMSW__) && !wxUSE_MFC + #ifndef STRICT + #define STRICT 1 + #endif + #include <windows.h> #include "wx/msw/winundef.h" #endif