From 547b668c7bea3582f27538d5acc8fdf48588f2b0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 25 Apr 2000 07:07:56 +0000 Subject: [PATCH] fix for ugly code doing undefined things to wxF(F)ile git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wfstream.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 3e1970a3ff..b5371fe390 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 11/07/98 // RCS-ID: $Id$ -// Copyright: (c) Guilhem Lavaux +// Copyright: (c) Guilhem Lavaux // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -79,7 +79,7 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) if (ret == wxInvalidOffset) { m_lasterror = wxStream_READ_ERR; ret = 0; - } + } return ret; } @@ -165,9 +165,11 @@ size_t wxFileOutputStream::GetSize() const // ---------------------------------------------------------------------------- // wxFileStream // ---------------------------------------------------------------------------- + wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file) + : wxFileInputStream(fileName) { + wxFileOutputStream::m_file = wxFileInputStream::m_file; } // ---------------------------------------------------------------------------- @@ -222,7 +224,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) if (ret == wxInvalidOffset) { m_lasterror = wxStream_READ_ERR; ret = 0; - } + } return ret; } @@ -308,10 +310,13 @@ size_t wxFFileOutputStream::GetSize() const // ---------------------------------------------------------------------------- // wxFFileStream // ---------------------------------------------------------------------------- + wxFFileStream::wxFFileStream(const wxString& fileName) - : wxFFileInputStream(fileName), wxFFileOutputStream(*wxFFileInputStream::m_file) + : wxFFileInputStream(fileName) { + wxFFileOutputStream::m_file = wxFFileInputStream::m_file; } + #endif // wxUSE_STREAMS && wxUSE_FILE