X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e22036dc390137b9926a5f87ea08399332da0b6d..4c7e33c5ea8f4e68a1468333e26251d0271613b0:/include/wx/stream.h diff --git a/include/wx/stream.h b/include/wx/stream.h index 95422e07dd..13bd256293 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -29,6 +29,13 @@ typedef wxOutputStream& (*__wxOutputManip)(wxOutputStream&); wxOutputStream& WXDLLEXPORT wxEndL(wxOutputStream& o_stream); +// Disable warnings such as +// 'wxFilterStream' : inherits 'wxFilterInputStream::Peek' via dominance + +#ifdef _MSC_VER +#pragma warning(disable:4250) +#endif + // --------------------------------------------------------------------------- // Stream buffer // --------------------------------------------------------------------------- @@ -99,7 +106,7 @@ class WXDLLEXPORT wxInputStream { wxInputStream& operator>>(int& i); wxInputStream& operator>>(long& i); wxInputStream& operator>>(float& i); -#if USE_SERIAL +#if wxUSE_SERIAL wxInputStream& operator>>(wxObject *& obj); #endif @@ -153,7 +160,7 @@ class WXDLLEXPORT wxOutputStream { wxOutputStream& operator<<(int i); wxOutputStream& operator<<(long i); wxOutputStream& operator<<(double f); -#if USE_SERIAL +#if wxUSE_SERIAL wxOutputStream& operator<<(wxObject& obj); #endif @@ -183,8 +190,8 @@ class WXDLLEXPORT wxOutputStream { wxStreamBuffer *m_o_streambuf; }; -class wxStream: virtual public wxInputStream, - virtual public wxOutputStream +class WXDLLEXPORT wxStream: public virtual wxInputStream, + public virtual wxOutputStream { public: wxStream(); @@ -194,7 +201,7 @@ class wxStream: virtual public wxInputStream, // "Filter" streams // --------------------------------------------------------------------------- -class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream { +class WXDLLEXPORT wxFilterInputStream: public virtual wxInputStream { public: wxFilterInputStream(); wxFilterInputStream(wxInputStream& stream); @@ -215,7 +222,7 @@ class WXDLLEXPORT wxFilterInputStream: virtual public wxInputStream { wxInputStream *m_parent_i_stream; }; -class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream { +class WXDLLEXPORT wxFilterOutputStream: public virtual wxOutputStream { public: wxFilterOutputStream(); wxFilterOutputStream(wxOutputStream& stream); @@ -237,11 +244,15 @@ class WXDLLEXPORT wxFilterOutputStream: virtual public wxOutputStream { }; class WXDLLEXPORT wxFilterStream: public wxStream, - virtual public wxFilterInputStream, - virtual public wxFilterOutputStream { + public virtual wxFilterInputStream, + public virtual wxFilterOutputStream { public: wxFilterStream(wxStream& stream); wxFilterStream(); }; +#ifdef _MSC_VER +#pragma warning(default:4250) +#endif + #endif