X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc65c743e5f60970e26b26c4ffee2baca5a42585..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 5bc7cf1ce2..65e8ceb266 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -107,9 +107,9 @@ wxFileOffset wxFileInputStream::OnSysTell() const return m_file->Tell(); } -bool wxFileInputStream::IsOk() const -{ - return (wxStreamBase::IsOk() && m_file->IsOpened()); +bool wxFileInputStream::IsOk() const +{ + return wxInputStream::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -183,9 +183,9 @@ wxFileOffset wxFileOutputStream::GetLength() const return m_file->Length(); } -bool wxFileOutputStream::IsOk() const -{ - return (wxStreamBase::IsOk() && m_file->IsOpened()); +bool wxFileOutputStream::IsOk() const +{ + return wxOutputStream::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -225,7 +225,12 @@ wxFileStream::wxFileStream(const wxString& fileName) wxFileOutputStream::m_file = wxFileInputStream::m_file; } -#endif //wxUSE_FILE +bool wxFileStream::IsOk() const +{ + return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk(); +} + +#endif // wxUSE_FILE #if wxUSE_FFILE @@ -300,9 +305,9 @@ wxFileOffset wxFFileInputStream::OnSysTell() const return m_file->Tell(); } -bool wxFFileInputStream::IsOk() const -{ - return (wxStreamBase::IsOk() && m_file->IsOpened()); +bool wxFFileInputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -386,9 +391,9 @@ wxFileOffset wxFFileOutputStream::GetLength() const return m_file->Length(); } -bool wxFFileOutputStream::IsOk() const -{ - return (wxStreamBase::IsOk() && m_file->IsOpened()); +bool wxFFileOutputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -401,6 +406,11 @@ wxFFileStream::wxFFileStream(const wxString& fileName) wxFFileOutputStream::m_file = wxFFileInputStream::m_file; } +bool wxFFileStream::IsOk() const +{ + return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); +} + #endif //wxUSE_FFILE #endif // wxUSE_STREAMS