disable MSVC warning 4275 correctly (closes #10885)

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 513f2d6ea95c54f8cb7005acdf2d5b9490620fd0..3d4e437fbe9d75f19e18dc9e7e6c7bd542974653 100644 (file)
--- 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!
     // 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
 
     #pragma warning (disable:4275)
 #endif
 


@@ -93,7 +94,7 @@ private:
 };
 
 #ifdef __VISUALC6__
 };
 
 #ifdef __VISUALC6__

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #endif
 
 #endif // wxUSE_MDI_ARCHITECTURE
 #endif
 
 #endif // wxUSE_MDI_ARCHITECTURE

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 0ac6cdcb3e4d931037a17c7c9100a1fde3d7bcba..b8bb1f31c9a4a20498acd6018dd5bb93e7a15961 100644 (file)
--- 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!
     // 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
 
     #pragma warning (disable:4275)
 #endif
 


@@ -744,7 +745,7 @@ private:
 };
 
 #ifdef __VISUALC6__
 };
 
 #ifdef __VISUALC6__

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 7156134f79e31f2ac70aa19a1033c1c44c241b68..59fdc3df1000c9a4142083c7a98f396740d85645 100644 (file)
--- 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
 #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
 
     #pragma warning (disable:4275)
 #endif
 


@@ -97,7 +98,7 @@ private:
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/string.h b/include/wx/string.h
index c5658d9fc471582145290d97d301c3d725c4d608..cc9e4dc8c82669f8998dfbedb08df38de6bee672 100644 (file)
--- 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
 #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
 
     #pragma warning (disable:4275)
 #endif
 


@@ -3576,7 +3577,7 @@ private:
 };
 
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
 };
 
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #endif
 
 // string iterator operators that satisfy STL Random Access Iterator
 #endif
 
 // string iterator operators that satisfy STL Random Access Iterator

diff --git a/include/wx/ustring.h b/include/wx/ustring.h
index a59d46b307ea0f137fb49faefdb37f3072e4d3a1..e12c1dfeacad35374e0962ad29d5225d301dc634 100644 (file)
--- 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)
     // "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
 
     #pragma warning(disable:4275)
 #endif
 


@@ -596,7 +597,7 @@ public:
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning(default:4275)
+    #pragma warning(pop)

 #endif
 
 inline wxUString operator+(const wxUString &s1, const wxUString &s2)
 #endif
 
 inline wxUString operator+(const wxUString &s1, const wxUString &s2)