X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/345fec0d578c3033b82d799fbfd0c647b2229e30..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index c912b92eaf..362b1861d6 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/common/fstream.cpp +// Name: src/common/wfstream.cpp // Purpose: "File stream" classes // Author: Julian Smart // Modified by: // Created: 11/07/98 -// RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -109,7 +108,7 @@ wxFileOffset wxFileInputStream::OnSysTell() const bool wxFileInputStream::IsOk() const { - return wxStreamBase::IsOk() && m_file->IsOpened(); + return wxInputStream::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -185,7 +184,7 @@ wxFileOffset wxFileOutputStream::GetLength() const bool wxFileOutputStream::IsOk() const { - return wxStreamBase::IsOk() && m_file->IsOpened(); + return wxOutputStream::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -220,17 +219,24 @@ size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size) // ---------------------------------------------------------------------------- wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(fileName) + : wxFileInputStream(), + wxFileOutputStream() { - wxFileOutputStream::m_file = wxFileInputStream::m_file; + wxFileOutputStream::m_file = + wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write); + + // this is a bit ugly as streams are symmetric but we still have to delete + // the file we created above exactly once so we decide to (arbitrarily) do + // it in wxFileInputStream + wxFileInputStream::m_file_destroy = true; } bool wxFileStream::IsOk() const { - return wxFileOutputStream::IsOk() && wxFileInputStream::m_file->IsOpened(); + return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk(); } -#endif //wxUSE_FILE +#endif // wxUSE_FILE #if wxUSE_FFILE @@ -400,10 +406,23 @@ bool wxFFileOutputStream::IsOk() const // wxFFileStream // ---------------------------------------------------------------------------- -wxFFileStream::wxFFileStream(const wxString& fileName) - : wxFFileInputStream(fileName) +wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode) + : wxFFileInputStream(), + wxFFileOutputStream() +{ + wxASSERT_MSG( mode.find_first_of('+') != wxString::npos, + "must be opened in read-write mode for this class to work" ); + + wxFFileOutputStream::m_file = + wxFFileInputStream::m_file = new wxFFile(fileName, mode); + + // see comment in wxFileStream ctor + wxFFileInputStream::m_file_destroy = true; +} + +bool wxFFileStream::IsOk() const { - wxFFileOutputStream::m_file = wxFFileInputStream::m_file; + return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); } #endif //wxUSE_FFILE