X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..1a1498c08b07625baa087622e75637a2f15325b6:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index eff6f75395..1d3844dd9c 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -5,66 +5,52 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// check if to use precompiled headers -#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__) - #if !NOPCH +// compiler detection; includes setup.h +#include "wx/defs.h" + +// 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 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 - -#ifdef GetClassInfo -#undef GetClassInfo -#endif - -#ifdef GetClassName -#undef GetClassName -#endif - -#ifdef DrawText -#undef DrawText -#endif - -#ifdef GetCharWidth -#undef GetCharWidth -#endif - -#ifdef StartDoc -#undef StartDoc -#endif -#ifdef FindWindow -#undef FindWindow -#endif +// include first to ensure that UNICODE macro is correctly set +// _before_ including +#include "wx/wxchar.h" -#ifdef FindResource -#undef FindResource +// include standard Windows headers +#if defined(__WXMSW__) + #include "wx/msw/wrapwin.h" #endif -#ifdef LoadAccelerators -#undef LoadAccelerators +// include all PalmOS headers at once +#ifdef __WXPALMOS__ +# include #endif -#else - // always include this file (under Unix it's generated by configure) - #include "wx/setup.h" -#endif +// include the most common wx headers +#include "wx/wx.h" +#endif // WX_PRECOMP