X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/733b8ed3f9757ce3b7197e0ab203a6b05f3469d7..159960c0e711edd4b2fbba4b9e41e81333868d62:/src/common/stream.cpp diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 9c006b8f7a..048544a225 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -38,7 +38,6 @@ #include #include "wx/stream.h" #include "wx/datstrm.h" -#include "wx/objstrm.h" #include "wx/textfile.h" // ---------------------------------------------------------------------------- @@ -95,7 +94,14 @@ wxStreamBuffer::wxStreamBuffer(BufMode mode) { Init(); - m_stream = new wxStreamBase; + wxASSERT_MSG(mode != read_write, wxT("you have to use the other ctor for read_write mode") ); + if ( mode == read ) + m_stream = new wxInputStream; + else if ( mode == write) + m_stream = new wxOutputStream; + else + m_stream = NULL; + m_mode = mode; m_flushable = FALSE; @@ -843,19 +849,6 @@ off_t wxInputStream::TellI() const return pos; } -// -------------------- -// Overloaded operators -// -------------------- - -#if wxUSE_SERIAL -wxInputStream& wxInputStream::operator>>(wxObject *& obj) -{ - wxObjectInputStream obj_s(*this); - obj = obj_s.LoadObject(); - return *this; -} -#endif // wxUSE_SERIAL - // ---------------------------------------------------------------------------- // wxOutputStream @@ -906,14 +899,6 @@ void wxOutputStream::Sync() { } -#if wxUSE_SERIAL -wxOutputStream& wxOutputStream::operator<<(wxObject& obj) -{ - wxObjectOutputStream obj_s(*this); - obj_s.SaveObject(obj); - return *this; -} -#endif // wxUSE_SERIAL // ---------------------------------------------------------------------------- // wxCountingOutputStream