X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8af111fa5d3916e6f42fee3af0ab1bec0ace7b6..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 69178254fa..ec7f60c7f0 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -14,13 +14,12 @@ // check if to use precompiled headers: do it for most Windows compilers unless // explicitly disabled by defining NOPCH -#if ( defined(__WXMSW__) && \ - ( defined(__BORLANDC__) || \ - defined(__VISUALC__) || \ - defined(__DIGITALMARS__) || \ - defined(__WATCOMC__) ) ) || \ - defined(__VISAGECPP__) || \ - defined(__MWERKS__) +#if defined(__VISUALC__) || \ + defined(__DMC__) || \ + defined(__VISAGECPP__) || \ + defined(__WATCOMC__) || \ + defined(__BORLANDC__) + // If user did not request NOCPH and we're not building using configure // then assume user wants precompiled headers. @@ -36,18 +35,19 @@ #ifdef WX_PRECOMP -// include first to ensure that UNICODE macro is correctly set +// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set // _before_ including -#include "wx/wxchar.h" +#include "wx/chartype.h" // include standard Windows headers -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/wrapwin.h" + #include "wx/msw/private.h" #endif - -// include all PalmOS headers at once -#ifdef __WXPALMOS__ -# include +#if defined(__WXMSW__) + #include "wx/msw/wrapcctl.h" + #include "wx/msw/wrapcdlg.h" + #include "wx/msw/missing.h" #endif // include @@ -55,11 +55,6 @@ # include "wx/os2/private.h" #endif -// include mgl headers -#ifdef __WXMGL__ -# include "wx/mgl/private.h" -#endif - // include the most common wx headers #include "wx/wx.h"