disable MSVC warning 4275 correctly (closes #10885)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-12 03:37:47 +00:00
parent 527983315d
commit fb330c2ec3
5 changed files with 10 additions and 5 deletions

View File

@@ -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)