X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9d59ee7e0cbe4acae6153adafb5ddce9a4e65dd..359bd4d1a20bdd5c6374f25779a43e92eebe9a1d:/include/wx/beforestd.h?ds=sidebyside

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 6f8eb762f1..684b8428c3 100644
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -20,15 +20,26 @@
     it can be included several times.
  */
 
-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+// 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!
+
+        // unreachable code
+        #pragma warning(disable:4702)
+
         #pragma warning(push, 1)
     #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)