fixed outdated filenames

[wxWidgets.git] / include / wx / wfstream.h

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 29f13ca1e43b096fff615e1eace693abff9948b7..fedadfae4ad23e92df81805bfc8a10ac5fe65129 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -16,20 +16,28 @@
 #pragma interface "wfstream.h"
 #endif
 
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/stream.h>
-#include <wx/file.h>
+#include "wx/defs.h"
 
-class wxFileInputStream: public wxInputStream {
+#if wxUSE_STREAMS && wxUSE_FILE
+
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/stream.h"
+#include "wx/file.h"
+#include "wx/ffile.h"
+
+// ----------------------------------------------------------------------------
+// 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(); }
 
@@ -45,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);
@@ -53,11 +61,11 @@ class wxFileOutputStream: public wxOutputStream {
   virtual ~wxFileOutputStream();
 
   // To solve an ambiguity on GCC
-  inline wxOutputStream& Write(const void *buffer, size_t size)
-     { return wxOutputStream::Write(buffer, size); }
+//  inline wxOutputStream& Write(const void *buffer, size_t size)
+//     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
-  size_t StreamSize() const;
+  size_t GetSize() const;
 
   bool Ok() const { return m_file->IsOpened(); }
 
@@ -73,9 +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__
+
+
+
+
+
+
+
+