Some compile warnings removed; file selector prototypes put in each filedlg.h;

[wxWidgets.git] / include / wx / wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 9e12d8f875b7291a33bd827b80c42399d1befd21..b1a93f2493be898a4e6de14b73d4fecc27732ee1 100644 (file)
--- 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,9 @@
 
 // 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
@@ -57,5 +59,12 @@
 #undef FindResource
 #endif
 
+#ifdef LoadAccelerators
+#undef LoadAccelerators
+#endif
+
+#else
+  // always include this file (under Unix it's generated by configure)
+  #include "wx/setup.h"
 #endif