X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9df3f0586be52d8a7dabfe51283de2795d73cf4..107d0fd493dc4d750ba18518a2eea5b93d988965:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index d89d5bfb64..f0b0178083 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -195,18 +195,19 @@ wxFileStream::wxFileStream(const wxString& fileName) // wxFFileInputStream // ---------------------------------------------------------------------------- -wxFFileInputStream::wxFFileInputStream(const wxString& fileName) - : wxInputStream() +wxFFileInputStream::wxFFileInputStream(const wxString& fileName, + const wxChar *mode) + : wxInputStream() { - m_file = new wxFFile(fileName, _T("rb")); + m_file = new wxFFile(fileName, mode); m_file_destroy = true; } wxFFileInputStream::wxFFileInputStream() - : wxInputStream() + : wxInputStream() { - m_file_destroy = false; m_file = NULL; + m_file_destroy = false; } wxFFileInputStream::wxFFileInputStream(wxFFile& file) @@ -250,14 +251,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { -#ifdef __VMS -#pragma message disable intsignchange -#endif - wxASSERT_MSG( pos >= 0 && pos <= LONG_MAX, _T("no huge wxFFile support") ); - return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset ); -#ifdef __VMS -#pragma message enable intsignchange -#endif + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } wxFileOffset wxFFileInputStream::OnSysTell() const @@ -269,9 +263,10 @@ wxFileOffset wxFFileInputStream::OnSysTell() const // wxFFileOutputStream // ---------------------------------------------------------------------------- -wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) +wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName, + const wxChar *mode) { - m_file = new wxFFile(fileName, _T("w+b")); + m_file = new wxFFile(fileName, mode); m_file_destroy = true; if (!m_file->IsOpened()) @@ -292,10 +287,10 @@ wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) } wxFFileOutputStream::wxFFileOutputStream() - : wxOutputStream() + : wxOutputStream() { - m_file_destroy = false; m_file = NULL; + m_file_destroy = false; } wxFFileOutputStream::wxFFileOutputStream(FILE *file) @@ -331,14 +326,7 @@ wxFileOffset wxFFileOutputStream::OnSysTell() const wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { -#ifdef __VMS -#pragma message disable intsignchange -#endif - wxASSERT_MSG( pos >= 0 && pos <= LONG_MAX, _T("no huge wxFFile support") ); - return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset ); -#ifdef __VMS -#pragma message enable intsignchange -#endif + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } void wxFFileOutputStream::Sync() @@ -362,6 +350,5 @@ wxFFileStream::wxFFileStream(const wxString& fileName) wxFFileOutputStream::m_file = wxFFileInputStream::m_file; } -#endif - // wxUSE_STREAMS && wxUSE_FILE +#endif // wxUSE_STREAMS && wxUSE_FILE