X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad5c34f309074eefe625b82e1203eec5b91247f5..46bde8dcf2245956223da69cce5bf93ba22a087e:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index b7c00c4f70..1d3844dd9c 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -5,62 +5,52 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:   	wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__)) && defined(__WXMSW__)
-#if !NOPCH
-#define WX_PRECOMP
-#endif
+// 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
-#ifndef __WXMAC__
-#include <windows.h>
-#endif
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-#undef GetClassName
-#endif
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
 
-#ifdef DrawText
-#undef DrawText
+// include standard Windows headers
+#if defined(__WXMSW__)
+    #include "wx/msw/wrapwin.h"
 #endif
 
-#ifdef GetCharWidth
-#undef GetCharWidth
+// include all PalmOS headers at once
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
 #endif
 
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifdef FindWindow
-#undef FindWindow
-#endif
-
-#ifdef FindResource
-#undef FindResource
-#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