X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/859906241dff9079dbfe73a39abda5c9aed2f150..9c43d88f6d47342edafa8b5e502e33a7ce2b6d98:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 8370eebc6f..a142d44f7c 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -37,6 +37,8 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) { m_file = new wxFile(fileName, wxFile::read); m_file_destroy = true; + if ( !m_file->IsOpened() ) + m_lasterror = wxSTREAM_READ_ERROR; } wxFileInputStream::wxFileInputStream() @@ -115,14 +117,7 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName) m_file_destroy = true; if (!m_file->IsOpened()) - { m_lasterror = wxSTREAM_WRITE_ERROR; - } - else - { - if (m_file->Error()) - m_lasterror = wxSTREAM_WRITE_ERROR; - } } wxFileOutputStream::wxFileOutputStream(wxFile& file) @@ -183,6 +178,33 @@ wxFileOffset wxFileOutputStream::GetLength() const return m_file->Length(); } +// ---------------------------------------------------------------------------- +// wxTempFileOutputStream +// ---------------------------------------------------------------------------- + +wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName) +{ + m_file = new wxTempFile(fileName); + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; +} + +wxTempFileOutputStream::~wxTempFileOutputStream() +{ + if (m_file->IsOpened()) + Discard(); + delete m_file; +} + +size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size) +{ + if (IsOk() && m_file->Write(buffer, size)) + return size; + m_lasterror = wxSTREAM_WRITE_ERROR; + return 0; +} + // ---------------------------------------------------------------------------- // wxFileStream // ----------------------------------------------------------------------------