don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 89e8f7f6e1aa866cf3fb4951baf042603f31a4d6..6f8eb762f1b62057834423072d5ea3039ffc2748 100644 (file)
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -20,24 +20,12 @@
     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)
-
-    // 'id': identifier was truncated to 'num' characters in the debug info
-    #pragma warning(disable:4786)
-
+// 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
+    #if __VISUALC__ > 1100
         #pragma warning(push, 1)
-    #else
+    #else // VC 5
         // 'expression' : signed/unsigned mismatch
         #pragma warning(disable:4018)
 
@@ -49,4 +37,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
+