X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d5848668df9cd29d08c81b43ff459da946a21e4..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 76f16b4108..340404407e 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 ///////////////////////////////////////////////////////////////////////////// @@ -13,10 +13,17 @@ #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(__DIGITALMARS__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__) || defined(__MWERKS__) - #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 @@ -28,18 +35,22 @@ #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__) && !wxUSE_MFC - #ifndef STRICT - #define STRICT 1 - #endif +#if defined(__WXMSW__) + #include "wx/msw/wrapwin.h" + #include "wx/msw/wrapcctl.h" + #include "wx/msw/wrapcdlg.h" + #include "wx/msw/private.h" + #include "wx/msw/missing.h" +#endif - #include - #include "wx/msw/winundef.h" +// include +#ifdef __OS2__ +# include "wx/os2/private.h" #endif // include the most common wx headers