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
This commit is contained in:
Vadim Zeitlin
2000-04-25 07:07:56 +00:00
parent 041bc561e8
commit 547b668c7b

View File

@@ -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