X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff0ea71ceacc214261f90946cfa7c9b5980c40fd..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index df5e797186..4b215bf0dc 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -13,8 +13,9 @@ #include "wx/defs.h" // check if to use precompiled headers: do it for most Windows compilers unless +// adding DigitalMars here appears to amke it slower! // 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__) || defined(__MWERKS__) #if !defined(NOPCH) #define WX_PRECOMP #endif @@ -27,9 +28,17 @@ #ifdef WX_PRECOMP +// include first to ensure that UNICODE macro is correctly set +// _before_ including +#include "wx/wxchar.h" + // include standard Windows headers -#ifdef __WXMSW__ -// #include +#if defined(__WXMSW__) && !wxUSE_MFC + #ifndef STRICT + #define STRICT 1 + #endif + + #include #include "wx/msw/winundef.h" #endif