remove more occurrences of MSVC #pragma warning(default) (closes #10885)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index d57412d7e2febd3efece298ebafd03ec3f02c2ed..2ab5d743dbd01331be24691c7df45cc3f4a0a36a 100644 (file)
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -21,13 +21,6 @@
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
     // 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

diff --git a/include/wx/log.h b/include/wx/log.h
index a787afd3dddb3b5bf803da3e697ec5b3a48dc791..88b6475240d41708ece92078833dca82bad2942c 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -705,6 +705,7 @@ public:
 // VC6 produces a warning if we a macro expanding to nothing to
 // DECLARE_LOG_FUNCTION2:
 #if defined(__VISUALC__) && __VISUALC__ < 1300
+    #pragma warning(push)
     // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP'"
     #pragma warning(disable:4003)
 #endif
@@ -818,7 +819,7 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode);
 #endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
 
 #if defined(__VISUALC__) && __VISUALC__ < 1300
-    #pragma warning(default:4003)
+    #pragma warning(pop)
 #endif
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index e62127f06f96ddc236edc979484378003fc6669b..08880f3ebece8b1d20f3d9f28e6ae098dd46e843 100644 (file)
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -341,23 +341,24 @@ public:
       { return wxStdString(c_str(), length()); }
 #endif
 
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    // disable warning about Unlock() below not being inlined (first, it
+    // seems to be inlined nevertheless and second, even if it isn't, there
+    // is nothing we can do about this
+    #pragma warning(push)
+    #pragma warning (disable:4714)
+#endif
 
     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()
   {
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-      //RN - according to the above VC++ does indeed inline this,
-      //even though it spits out two warnings
-      #pragma warning (disable:4714)
-#endif
-
       GetStringData()->Unlock();
   }
 
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-    //re-enable inlining warning
-    #pragma warning (default:4714)
+    #pragma warning(pop)
 #endif
+
   // overloaded assignment
     // from another wxString
   wxStringImpl& operator=(const wxStringImpl& stringSrc);