X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4277bbc2531994afa3c467fb6e630822c8b6284..7921cf2badfac0c44cd53644bfc6a483a09ec299:/include/wx/wxprec.h?ds=sidebyside

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index a5e0b4bce8..b1a93f2493 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers
-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)
+#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__)) && defined(__WXMSW__)
 #if !NOPCH
 #define WX_PRECOMP
 #endif
@@ -27,7 +27,7 @@
 
 // Comment this out if you don't mind slower compilation of the wxWindows
 // library
-#ifndef __WXMAC__
+#if !defined(__WXMAC__) && !defined(__SALFORDC__)
 #include <windows.h>
 #endif
 
@@ -59,6 +59,10 @@
 #undef FindResource
 #endif
 
+#ifdef LoadAccelerators
+#undef LoadAccelerators
+#endif
+
 #else
   // always include this file (under Unix it's generated by configure)
   #include "wx/setup.h"