X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e69a1ea87c7798c55254e42d64acc4495abe438e..e0176dd9fb716ad0a1a8804f0a93e16048f09054:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index d460dd61ab..296f205b2e 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -6,10 +6,10 @@ // Created: 11/07/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "wfstream.h" #endif @@ -198,7 +198,7 @@ wxFileStream::wxFileStream(const wxString& fileName) wxFFileInputStream::wxFFileInputStream(const wxString& fileName) : wxInputStream() { - m_file = new wxFFile(fileName, "rb"); + m_file = new wxFFile(fileName, _T("rb")); m_file_destroy = TRUE; } @@ -251,7 +251,13 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode) { - return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset ); +#ifdef __VMS +#pragma message disable intsignchange +#endif + return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset ); +#ifdef __VMS +#pragma message enable intsignchange +#endif } off_t wxFFileInputStream::OnSysTell() const @@ -265,7 +271,7 @@ off_t wxFFileInputStream::OnSysTell() const wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) { - m_file = new wxFFile(fileName, "w+b"); + m_file = new wxFFile(fileName, _T("w+b")); m_file_destroy = TRUE; if (!m_file->IsOpened()) @@ -324,7 +330,13 @@ off_t wxFFileOutputStream::OnSysTell() const off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) { - return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset ); +#ifdef __VMS +#pragma message disable intsignchange +#endif + return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset ); +#ifdef __VMS +#pragma message enable intsignchange +#endif } void wxFFileOutputStream::Sync()