X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6040c9de7421d2c7770d7f54687a2413be5a79d1..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/wxprec.h?ds=sidebyside diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index e4f29ad5b4..ec7f60c7f0 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wxprec.h +// Name: wx/wxprec.h // Purpose: Includes the appropriate files for precompiled headers // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,8 +14,16 @@ // 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(__VISAGECPP__) - #if !defined(NOPCH) +#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. + #if !defined(NOPCH) && !defined(__WX_SETUP_H__) #define WX_PRECOMP #endif #endif @@ -27,10 +35,24 @@ #ifdef WX_PRECOMP +// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set +// _before_ including +#include "wx/chartype.h" + // include standard Windows headers -#if defined(__WXMSW__) && !wxUSE_MFC - #include - #include "wx/msw/winundef.h" +#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/missing.h" +#endif + +// include +#ifdef __OS2__ +# include "wx/os2/private.h" #endif // include the most common wx headers