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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 80526f249b..4037833a48 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -9,31 +9,43 @@
 // 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(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
-    #if !defined(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
 
-#ifdef __WXMSW__
-#include <windows.h>
-#include "wx/msw/winundef.h"
+// include <wx/wxchar.h> first to ensure that UNICODE macro is correctly set
+// _before_ including <windows.h>
+#include "wx/wxchar.h"
+
+// include standard Windows headers
+#if defined(__WXMSW__)
+    #include "wx/msw/wrapwin.h"
 #endif
 
+// include the most common wx headers
 #include "wx/wx.h"
 
-
 #endif // WX_PRECOMP
-