X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de4983f3236c2043479abb21857aca958a7b61f0..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/ustring.h?ds=sidebyside

diff --git a/include/wx/ustring.h b/include/wx/ustring.h
index 68494d5767..e12c1dfeac 100644
--- a/include/wx/ustring.h
+++ b/include/wx/ustring.h
@@ -31,6 +31,13 @@ typedef wxCharTypeBuffer<wxChar32> wxU32CharBuffer;
 typedef wxScopedCharTypeBuffer<wxChar32> wxScopedU32CharBuffer;
 #endif
 
+#ifdef __VISUALC__
+    // "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
 
 class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32>
 {
@@ -589,6 +596,10 @@ public:
 
 };
 
+#ifdef __VISUALC__
+    #pragma warning(pop)
+#endif
+
 inline wxUString operator+(const wxUString &s1, const wxUString &s2)
     { wxUString ret( s1 ); ret.append( s2 ); return ret; }
 inline wxUString operator+(const wxUString &s1, const char *s2)