X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..bf6c2b3505580f37f414669c0812f72d8509fac9:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index eff6f75395..80526f249b 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -9,9 +9,12 @@
 // 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 !NOPCH
+    #if !defined(NOPCH)
         #define WX_PRECOMP
     #endif
 #endif
@@ -23,48 +26,14 @@
 
 // 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__)
+#ifdef __WXMSW__
 #include <windows.h>
+#include "wx/msw/winundef.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
-
-#ifdef FindWindow
-#undef FindWindow
-#endif
-
-#ifdef FindResource
-#undef FindResource
-#endif
+#include "wx/wx.h"
 
-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
 
-#else
-  // always include this file (under Unix it's generated by configure)
-  #include "wx/setup.h"
-#endif
+#endif // WX_PRECOMP