Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1218c39632210b43b366253d79ecdb0a26d62ffe..a332d31490687051aaaea73d7ab0e0bb43ea218d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -46,6 +46,15 @@
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #endif
 
+// suppress some Salford C++ warnings
+#ifdef __SALFORDC__
+#   pragma suppress 353             // Possible nested comments
+#   pragma suppress 593             // Define not used
+#   pragma suppress 61              // enum has no name (doesn't suppress!)
+#   pragma suppress 106             // unnamed, unused parameter
+#   pragma suppress 571             // Virtual function hiding
+#endif
+
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
@@ -109,6 +118,8 @@
     #endif
 #elif defined(__SC__)
     typedef unsigned int bool;
+#elif defined(__SALFORDC__)
+    typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER <= 1000)
     typedef unsigned int bool;
 #elif defined(_MSC_VER) && (_MSC_VER == 1020)