X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1265174571765b279434383788a52832b5992b4..74ebd40690d3676e74a7cfc239eee6c7e9764f05:/src/common/wfstream.cpp?ds=sidebyside diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 9d15b4f9b6..74bdde1040 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "wfstream.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -37,6 +33,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 +113,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) @@ -234,6 +225,9 @@ wxFFileInputStream::wxFFileInputStream(const wxString& fileName, { m_file = new wxFFile(fileName, mode); m_file_destroy = true; + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; } wxFFileInputStream::wxFFileInputStream()