disable MSVC warning 4275 correctly (closes #10885)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-12 03:37:47 +00:00
parent 527983315d
commit fb330c2ec3
5 changed files with 10 additions and 5 deletions
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -408,6 +408,7 @@ protected:
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
    // "non dll-interface class 'wxStringPrintfMixin' used as base interface
    // for dll-interface class 'wxString'" -- this is OK in our case
+    #pragma warning (push)
    #pragma warning (disable:4275)
 #endif

@@ -3576,7 +3577,7 @@ private:
 };

 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-    #pragma warning (default:4275)
+    #pragma warning (pop)
 #endif

 // string iterator operators that satisfy STL Random Access Iterator