From fb330c2ec30fc5aca5ce0a885530d4d09b351a1d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Jun 2009 03:37:47 +0000
Subject: [PATCH] disable MSVC warning 4275 correctly (closes #10885)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/docmdi.h  | 3 ++-
 include/wx/docview.h | 3 ++-
 include/wx/msgout.h  | 3 ++-
 include/wx/string.h  | 3 ++-
 include/wx/ustring.h | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 513f2d6ea9..3d4e437fbe 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -64,6 +64,7 @@ private:
     // for dll-interface class 'wxDocMDIChildFrame'" -- this is bogus as the
     // template will be DLL-exported but only once it is used as base class
     // here!
+    #pragma warning (push)
     #pragma warning (disable:4275)
 #endif
 
@@ -93,7 +94,7 @@ private:
 };
 
 #ifdef __VISUALC6__
-    #pragma warning (default:4275)
+    #pragma warning (pop)
 #endif
 
 #endif // wxUSE_MDI_ARCHITECTURE
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 0ac6cdcb3e..b8bb1f31c9 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -695,6 +695,7 @@ private:
     // for dll-interface class 'wxDocChildFrame'" -- this is bogus as the
     // template will be DLL-exported but only once it is used as base class
     // here!
+    #pragma warning (push)
     #pragma warning (disable:4275)
 #endif
 
@@ -744,7 +745,7 @@ private:
 };
 
 #ifdef __VISUALC6__
-    #pragma warning (default:4275)
+    #pragma warning (pop)
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 7156134f79..59fdc3df10 100644
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -69,6 +69,7 @@ protected:
 #ifdef __VISUALC__
     // "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
 
@@ -97,7 +98,7 @@ private:
 };
 
 #ifdef __VISUALC__
-    #pragma warning (default:4275)
+    #pragma warning (pop)
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/string.h b/include/wx/string.h
index c5658d9fc4..cc9e4dc8c8 100644
--- 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
diff --git a/include/wx/ustring.h b/include/wx/ustring.h
index a59d46b307..e12c1dfeac 100644
--- a/include/wx/ustring.h
+++ b/include/wx/ustring.h
@@ -35,6 +35,7 @@ typedef wxScopedCharTypeBuffer<wxChar32> wxScopedU32CharBuffer;
     // "non dll-interface class 'std::basic_string<wxChar32>' used as base
     // interface for dll-interface class 'wxString'" -- this is OK in our case
     // (and warning is unavoidable anyhow)
+    #pragma warning(push)
     #pragma warning(disable:4275)
 #endif
 
@@ -596,7 +597,7 @@ public:
 };
 
 #ifdef __VISUALC__
-    #pragma warning(default:4275)
+    #pragma warning(pop)
 #endif
 
 inline wxUString operator+(const wxUString &s1, const wxUString &s2)
-- 
2.45.2