X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff0ea71ceacc214261f90946cfa7c9b5980c40fd..ec8565f3c5d1df72267cb1e3375789090ac091da:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index df5e797186..4037833a48 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -14,8 +14,17 @@ // 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(NOPCH) +#if ( defined(__WXMSW__) && \ + ( defined(__BORLANDC__) || \ + defined(__VISUALC__) || \ + defined(__DIGITALMARS__) || \ + defined(__WATCOMC__) ) ) || \ + defined(__VISAGECPP__) || \ + defined(__MWERKS__) + + // If user did not request NOCPH and we're not building using configure + // then assume user wants precompiled headers. + #if !defined(NOPCH) && !defined(__WX_SETUP_H__) #define WX_PRECOMP #endif #endif @@ -27,10 +36,13 @@ #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 - #include "wx/msw/winundef.h" +#if defined(__WXMSW__) + #include "wx/msw/wrapwin.h" #endif // include the most common wx headers