Removed redundant code

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

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 89e8f7f6e1aa866cf3fb4951baf042603f31a4d6..684b8428c38f018ec73baa842b2b08f2e38fdbce 100644 (file)
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -20,27 +20,26 @@
     it can be included several times.
  */
 
-#ifdef _MSC_VER
-    // these warning have to be disabled and not just temporarily disabled
-    // because they will be given at the end of the compilation of the current
-    // source -- and there is absolutely nothing we can do about them
-
-    // 'foo': unreferenced inline function has been removed
-    #pragma warning(disable:4514)
-
-    // 'function' : function not inlined
-    #pragma warning(disable:4710)
+// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
+// defines _MSC_VER as 1201) does need to be included as it's VC6-like
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
+    // MSVC 5 does not have this
+    #if __VISUALC__ > 1100
+        // we have to disable (and reenable in afterstd.h) this one because,
+        // even though it is of level 4, it is not disabled by warning(push, 1)
+        // below for VC7.1!
 
-    // 'id': identifier was truncated to 'num' characters in the debug info
-    #pragma warning(disable:4786)
+        // unreachable code
+        #pragma warning(disable:4702)
 
-    // MSVC 5 does not have this
-    #if _MSC_VER > 1100
         #pragma warning(push, 1)
-    #else
+    #else // VC 5
         // 'expression' : signed/unsigned mismatch
         #pragma warning(disable:4018)
 
+        // 'identifier' : unreferenced formal parameter
+        #pragma warning(disable:4100)
+
         // 'conversion' : conversion from 'type1' to 'type2',
         // possible loss of data
         #pragma warning(disable:4244)
@@ -49,4 +48,18 @@
         // 'identifier' use the following syntax
         #pragma warning(disable:4663)
     #endif
-#endif
+
+    // these warning have to be disabled and not just temporarily disabled
+    // because they will be given at the end of the compilation of the
+    // current source and there is absolutely nothing we can do about them
+
+    // 'foo': unreferenced inline function has been removed
+    #pragma warning(disable:4514)
+
+    // 'function' : function not inlined
+    #pragma warning(disable:4710)
+
+    // 'id': identifier was truncated to 'num' characters in the debug info
+    #pragma warning(disable:4786)
+#endif // VC++ < 7
+