Rebake from clean wx tree.

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

diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 5bf6377113674fdb03a8bf811a943fa5bb9a8cc6..832a7ee4e8a13733f06c9eaf254274a4bd456a2f 100644 (file)
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -23,6 +23,20 @@
 // 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
 // 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

+    // 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 so
+    // disable them before warning(push) below
+
+    // '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)
+

     // MSVC 5 does not have this
     #if __VISUALC__ > 1100
         // we have to disable (and reenable in afterstd.h) this one because,
     // MSVC 5 does not have this
     #if __VISUALC__ > 1100
         // we have to disable (and reenable in afterstd.h) this one because,


@@ -48,19 +62,6 @@
         // 'identifier' use the following syntax
         #pragma warning(disable:4663)
     #endif
         // 'identifier' use the following syntax
         #pragma warning(disable:4663)
     #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
 
 /**
 #endif // VC++ < 7
 
 /**