X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed58dbeab64d18a0f869ea8e1610a0a88ad7b22c..aaf46fd6fcb22775a81df11a722703c560ee17f7:/include/wx/wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 33217d75b5..fedadfae4a 100644
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -24,8 +24,13 @@
 #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);
@@ -48,7 +53,7 @@ class wxFileInputStream: public wxInputStream {
   bool m_file_destroy;
 };
 
-class wxFileOutputStream: public wxOutputStream {
+class WXDLLEXPORT wxFileOutputStream: public wxOutputStream {
  public:
   wxFileOutputStream(const wxString& fileName);
   wxFileOutputStream(wxFile& file);
@@ -76,14 +81,80 @@ class wxFileOutputStream: public wxOutputStream {
   bool m_file_destroy;
 };
 
-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;
+};
+
+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;
+};
+
+class WXDLLEXPORT wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
+ public:
+  wxFFileStream(const wxString& fileName);
+};
 #endif
   // wxUSE_STREAMS && wxUSE_FILE
 
 #endif
   // _WX_WXFSTREAM_H__
 
+
+
+
+
+
+
+