X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc413685c65b83da833009e499e3e44e6b447464..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 6f542b6a45..340404407e 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -1,70 +1,59 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" // always include this file (under Unix it's generated by configure) -#include "wx/defs.h" // compiler definitions +// compiler detection; includes setup.h +#include "wx/defs.h" -// check if to use precompiled headers -#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__) - #if !NOPCH +// check if to use precompiled headers: do it for most Windows compilers unless +// explicitly disabled by defining 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 // For some reason, this must be defined for common dialogs to work. #ifdef __WATCOMC__ -#define INCLUDE_COMMDLG_H 1 + #define INCLUDE_COMMDLG_H 1 #endif -// include the wx definitions #ifdef WX_PRECOMP -#include "wx/wx.h" -// Comment this out if you don't mind slower compilation of the wxWindows -// library -#if !defined(__WXMAC__) && !defined(__SALFORDC__) -#include -#endif +// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set +// _before_ including +#include "wx/chartype.h" -#ifdef GetClassInfo -#undef GetClassInfo +// include standard Windows headers +#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 -#ifdef GetClassName -#undef GetClassName +// include +#ifdef __OS2__ +# include "wx/os2/private.h" #endif -#ifdef DrawText -#undef DrawText -#endif - -#ifdef GetCharWidth -#undef GetCharWidth -#endif - -#ifdef StartDoc -#undef StartDoc -#endif - -#ifdef FindWindow -#undef FindWindow -#endif - -#ifdef FindResource -#undef FindResource -#endif - -#ifdef LoadAccelerators -#undef LoadAccelerators -#endif +// include the most common wx headers +#include "wx/wx.h" #endif // WX_PRECOMP -