X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adcc13ac81119f349762f579e90a9610f6a39e8c..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/ustring.h 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 wxScopedU32CharBuffer; // "non dll-interface class 'std::basic_string' 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)