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:
parent
527983315d
commit
fb330c2ec3
@ -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
|
||||
|
@ -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
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user