X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c9e913f6f38abd072cab9ed88437d343a7ac934..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/wxprec.h?ds=inline diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 0c1c73d22d..ec7f60c7f0 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -17,10 +17,9 @@ #if defined(__VISUALC__) || \ defined(__DMC__) || \ defined(__VISAGECPP__) || \ - defined(__MWERKS__) || \ defined(__WATCOMC__) || \ defined(__BORLANDC__) - + // If user did not request NOCPH and we're not building using configure // then assume user wants precompiled headers. @@ -36,34 +35,26 @@ #ifdef WX_PRECOMP -// include "wx/wxchar.h" 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 +#if defined(__WXMSW__) #include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcdlg.h" - #include "wx/msw/private.h" #include "wx/msw/missing.h" #endif -// include all PalmOS headers at once -#ifdef __WXPALMOS__ -# include -#endif - // include #ifdef __OS2__ # 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"