X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2df98b237769d0958e62085dd3b26b8e0717e89f..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/wfstream.h?ds=sidebyside diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index 52c23478a7..de639c6262 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -12,7 +12,7 @@ #ifndef _WX_WXFSTREAM_H__ #define _WX_WXFSTREAM_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "wfstream.h" #endif @@ -20,20 +20,24 @@ #if wxUSE_STREAMS && wxUSE_FILE -#include -#include -#include -#include +#include "wx/object.h" +#include "wx/string.h" +#include "wx/stream.h" +#include "wx/file.h" +#include "wx/ffile.h" -class wxFileInputStream: public wxInputStream { +// ---------------------------------------------------------------------------- +// wxFileStream using wxFile +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxFileInputStream: public wxInputStream { public: wxFileInputStream(const wxString& ifileName); wxFileInputStream(wxFile& file); wxFileInputStream(int fd); ~wxFileInputStream(); - char Peek(); - size_t StreamSize() const; + size_t GetSize() const; bool Ok() const { return m_file->IsOpened(); } @@ -47,9 +51,11 @@ class wxFileInputStream: public wxInputStream { protected: wxFile *m_file; bool m_file_destroy; + + DECLARE_NO_COPY_CLASS(wxFileInputStream) }; -class wxFileOutputStream: public wxOutputStream { +class WXDLLEXPORT wxFileOutputStream: public wxOutputStream { public: wxFileOutputStream(const wxString& fileName); wxFileOutputStream(wxFile& file); @@ -61,7 +67,7 @@ class wxFileOutputStream: public wxOutputStream { // { return wxOutputStream::Write(buffer, size); } void Sync(); - size_t StreamSize() const; + size_t GetSize() const; bool Ok() const { return m_file->IsOpened(); } @@ -75,15 +81,88 @@ class wxFileOutputStream: public wxOutputStream { protected: wxFile *m_file; bool m_file_destroy; + + DECLARE_NO_COPY_CLASS(wxFileOutputStream) }; -class wxFileStream: public wxFileInputStream, public wxFileOutputStream { +class WXDLLEXPORT wxFileStream: public wxFileInputStream, public wxFileOutputStream { public: wxFileStream(const wxString& fileName); }; +// ---------------------------------------------------------------------------- +// wxFFileStream using wxFFile +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxFFileInputStream: public wxInputStream { + public: + wxFFileInputStream(const wxString& ifileName); + wxFFileInputStream(wxFFile& file); + wxFFileInputStream(FILE *file); + ~wxFFileInputStream(); + + size_t GetSize() const; + + bool Ok() const { return m_file->IsOpened(); } + + protected: + wxFFileInputStream(); + + size_t OnSysRead(void *buffer, size_t size); + off_t OnSysSeek(off_t pos, wxSeekMode mode); + off_t OnSysTell() const; + + protected: + wxFFile *m_file; + bool m_file_destroy; + + DECLARE_NO_COPY_CLASS(wxFFileInputStream) +}; + +class WXDLLEXPORT wxFFileOutputStream: public wxOutputStream { + public: + wxFFileOutputStream(const wxString& fileName); + wxFFileOutputStream(wxFFile& file); + wxFFileOutputStream(FILE *file); + virtual ~wxFFileOutputStream(); + + // To solve an ambiguity on GCC +// inline wxOutputStream& Write(const void *buffer, size_t size) +// { return wxOutputStream::Write(buffer, size); } + + void Sync(); + size_t GetSize() const; + + bool Ok() const { return m_file->IsOpened(); } + + protected: + wxFFileOutputStream(); + + size_t OnSysWrite(const void *buffer, size_t size); + off_t OnSysSeek(off_t pos, wxSeekMode mode); + off_t OnSysTell() const; + + protected: + wxFFile *m_file; + bool m_file_destroy; + + DECLARE_NO_COPY_CLASS(wxFFileOutputStream) +}; + +class WXDLLEXPORT wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream { + public: + wxFFileStream(const wxString& fileName); +}; #endif // wxUSE_STREAMS && wxUSE_FILE #endif - // _WX_WXFSTREAM_H__ \ No newline at end of file + // _WX_WXFSTREAM_H__ + + + + + + + +