X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/wxprec.h diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h index 71018481a8..6f542b6a45 100644 --- a/include/wx/wxprec.h +++ b/include/wx/wxprec.h @@ -6,19 +6,22 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/setup.h" // always include this file (under Unix it's generated by configure) +#include "wx/defs.h" // compiler definitions + // check if to use precompiled headers -#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) // && !defined(WXMAKINGDLL) -#if !NOPCH -#define WX_PRECOMP -#endif +#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__) + #if !NOPCH + #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 @@ -27,7 +30,9 @@ // 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 @@ -57,5 +62,9 @@ #undef FindResource #endif +#ifdef LoadAccelerators +#undef LoadAccelerators #endif +#endif // WX_PRECOMP +