X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92bf6cc15a327d69a8728c445518e4f69f0d8a37..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/wfstream.h diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 378ef9fcda..1c44202177 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -53,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 @@ -83,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 @@ -93,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; } @@ -108,7 +108,7 @@ protected: private: wxTempFile *m_file; - DECLARE_NO_COPY_CLASS(wxTempFileOutputStream) + wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream); }; class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream, @@ -118,8 +118,33 @@ 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 @@ -155,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 wxString& mode = "w+b"); + wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb"); wxFFileOutputStream(wxFFile& file); wxFFileOutputStream(FILE *file); virtual ~wxFFileOutputStream(); @@ -185,18 +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