enabling alpha on msw colour

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

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 6f8eb762f1b62057834423072d5ea3039ffc2748..945296dde1878dbcc2088fee9ab1eed5388b7d82 100644 (file)
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -20,10 +20,18 @@
     it can be included several times.
  */
 
     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
     // 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(push, 1)
     #else // VC 5
         // 'expression' : signed/unsigned mismatch