X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce3ed50dbe32d118321082db84c3a9abb047d5b7..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 0643443e9d..0bfccf8d0d 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,61 +6,38 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// 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(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__VISAGECPP__)
+    #if !defined(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
 #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 <windows.h>
-#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
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
 
-#ifdef FindWindow
-#undef FindWindow
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
 #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