oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index c74886ae8225d6885ff12e34a0bb90805131aad6..e4967e0a78b4b6a3577f8485856cf3c9168a6de5 100644 (file)
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -16,9 +16,17 @@
 #if defined(__WXMSW__) && defined(__MINGW32__)
     #include "wx/msw/winundef.h"
 #endif
-#ifdef _MSC_VER
+// VC 7.x isn't as bad as VC6 and doesn't give these warnings
+#if defined(__VISUALC__) && __VISUALC__ <= 1200
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
+        // don't restore this one for VC6, it gives it in each try/catch which is a
+        // bit annoying to say the least
+        #if _MSC_VER >= 0x1300
+            // unreachable code
+            #pragma warning(default:4702)
+        #endif // VC++ >= 7
+
         #pragma warning(pop)
     #else
         // 'expression' : signed/unsigned mismatch