Misc small changes

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

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index a5e0b4bce88707c3d44680a987866c20730cec7b..6f542b6a456b7d3c869e7fbb8ba1aa23631b8c81 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,19 +6,22 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// 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
 // check if to use precompiled headers

-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)
-#if !NOPCH
-#define WX_PRECOMP
-#endif
+#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
+    #if !NOPCH
+        #define WX_PRECOMP
+    #endif

 #endif
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__
 #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
 #endif
 
 // include the wx definitions


@@ -27,7 +30,7 @@
 
 // Comment this out if you don't mind slower compilation of the wxWindows
 // library
 
 // 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
 
 #include <windows.h>
 #endif
 


@@ -59,8 +62,9 @@
 #undef FindResource
 #endif
 
 #undef FindResource
 #endif
 

-#else
-  // always include this file (under Unix it's generated by configure)
-  #include "wx/setup.h"
+#ifdef LoadAccelerators
+#undef LoadAccelerators

 #endif
 
 #endif
 

+#endif // WX_PRECOMP
+