X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/wfstream.h diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 42b75669cd..1c44202177 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -34,11 +34,12 @@ public: wxFileInputStream(const wxString& ifileName); wxFileInputStream(wxFile& file); wxFileInputStream(int fd); - ~wxFileInputStream(); + virtual ~wxFileInputStream(); wxFileOffset GetLength() const; - bool Ok() const { return m_file->IsOpened(); } + bool Ok() const { return IsOk(); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -52,7 +53,7 @@ protected: wxFile *m_file; bool m_file_destroy; - DECLARE_NO_COPY_CLASS(wxFileInputStream) + wxDECLARE_NO_COPY_CLASS(wxFileInputStream); }; class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream @@ -67,7 +68,8 @@ public: bool Close() { return m_file_destroy ? m_file->Close() : true; } wxFileOffset GetLength() const; - bool Ok() const { return m_file->IsOpened(); } + bool Ok() const { return IsOk(); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -81,7 +83,7 @@ protected: wxFile *m_file; bool m_file_destroy; - DECLARE_NO_COPY_CLASS(wxFileOutputStream) + wxDECLARE_NO_COPY_CLASS(wxFileOutputStream); }; class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream @@ -91,8 +93,8 @@ public: virtual ~wxTempFileOutputStream(); bool Close() { return Commit(); } - virtual bool Commit() { return m_file->Commit(); } - virtual void Discard() { m_file->Discard(); } + WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); } + WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); } wxFileOffset GetLength() const { return m_file->Length(); } bool IsSeekable() const { return true; } @@ -106,7 +108,7 @@ protected: private: wxTempFile *m_file; - DECLARE_NO_COPY_CLASS(wxTempFileOutputStream) + wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream); }; class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, @@ -114,9 +116,35 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, { public: wxFileStream(const wxString& fileName); + virtual bool IsOk() const; + + // override (some) virtual functions inherited from both classes to resolve + // ambiguities (this wouldn't be necessary if wxStreamBase were a virtual + // base class but it isn't) + + virtual bool IsSeekable() const + { + return wxFileInputStream::IsSeekable(); + } + + virtual wxFileOffset GetLength() const + { + return wxFileInputStream::GetLength(); + } + +protected: + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) + { + return wxFileInputStream::OnSysSeek(pos, mode); + } + + virtual wxFileOffset OnSysTell() const + { + return wxFileInputStream::OnSysTell(); + } private: - DECLARE_NO_COPY_CLASS(wxFileStream) + wxDECLARE_NO_COPY_CLASS(wxFileStream); }; #endif //wxUSE_FILE @@ -130,14 +158,15 @@ private: class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream { public: - wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb")); + wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb"); wxFFileInputStream(wxFFile& file); wxFFileInputStream(FILE *file); - ~wxFFileInputStream(); + virtual ~wxFFileInputStream(); wxFileOffset GetLength() const; - bool Ok() const { return m_file->IsOpened(); } + bool Ok() const { return IsOk(); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -151,13 +180,13 @@ protected: wxFFile *m_file; bool m_file_destroy; - DECLARE_NO_COPY_CLASS(wxFFileInputStream) + wxDECLARE_NO_COPY_CLASS(wxFFileInputStream); }; class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream { public: - wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b")); + wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb"); wxFFileOutputStream(wxFFile& file); wxFFileOutputStream(FILE *file); virtual ~wxFFileOutputStream(); @@ -166,7 +195,8 @@ public: bool Close() { return m_file_destroy ? m_file->Close() : true; } wxFileOffset GetLength() const; - bool Ok() const { return m_file->IsOpened(); } + bool Ok() const { return IsOk(); } + virtual bool IsOk() const; bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; } protected: @@ -180,17 +210,43 @@ protected: wxFFile *m_file; bool m_file_destroy; - DECLARE_NO_COPY_CLASS(wxFFileOutputStream) + wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream); }; class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream, public wxFFileOutputStream { public: - wxFFileStream(const wxString& fileName); + wxFFileStream(const wxString& fileName, const wxString& mode = "w+b"); + + // override some virtual functions to resolve ambiguities, just as in + // wxFileStream + + virtual bool IsOk() const; + + virtual bool IsSeekable() const + { + return wxFFileInputStream::IsSeekable(); + } + + virtual wxFileOffset GetLength() const + { + return wxFFileInputStream::GetLength(); + } + +protected: + virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) + { + return wxFFileInputStream::OnSysSeek(pos, mode); + } + + virtual wxFileOffset OnSysTell() const + { + return wxFFileInputStream::OnSysTell(); + } private: - DECLARE_NO_COPY_CLASS(wxFFileStream) + wxDECLARE_NO_COPY_CLASS(wxFFileStream); }; #endif //wxUSE_FFILE