X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..39de6d6ca1dd08e07d7a71581eaa22cd1ece836d:/include/wx/beforestd.h

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 9196f32a08..945296dde1 100644
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -6,7 +6,7 @@
 // Created:     07/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -20,22 +20,30 @@
     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) 
+        // 'expression' : signed/unsigned mismatch
+        #pragma warning(disable:4018)
 
-        // 'conversion' : conversion from 'type1' to 'type2', 
-        // possible loss of data 
-        #pragma warning(disable:4244) 
+        // 'conversion' : conversion from 'type1' to 'type2',
+        // possible loss of data
+        #pragma warning(disable:4244)
 
-        // C++ language change: to explicitly specialize class template 
-        // 'identifier' use the following syntax 
-        #pragma warning(disable:4663) 
+        // C++ language change: to explicitly specialize class template
+        // 'identifier' use the following syntax
+        #pragma warning(disable:4663)
     #endif
 
     // these warning have to be disabled and not just temporarily disabled