Removed LastError() from wxFilterStream

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

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index b0f4dbb02abca76922850f5ed2689f580508a42d..49fd49d00a8b3d92ebc95bc150391dbbe73448d1 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -16,10 +16,19 @@
 #pragma interface "wfstream.h"
 #endif
 
 #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"
+
+#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 wxFileInputStream: public wxInputStream {
  public:
 
 class wxFileInputStream: public wxInputStream {
  public:


@@ -28,8 +37,7 @@ class wxFileInputStream: public wxInputStream {
   wxFileInputStream(int fd);
   ~wxFileInputStream();
 
   wxFileInputStream(int fd);
   ~wxFileInputStream();
 

-  char Peek();
-  size_t StreamSize() const;
+  size_t GetSize() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }
 


@@ -57,7 +65,7 @@ class wxFileOutputStream: public wxOutputStream {
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();

-  size_t StreamSize() const;
+  size_t GetSize() const;

 
   bool Ok() const { return m_file->IsOpened(); }
 
 
   bool Ok() const { return m_file->IsOpened(); }
 


@@ -78,4 +86,68 @@ class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
   wxFileStream(const wxString& fileName);
 };
 
   wxFileStream(const wxString& fileName);
 };
 

+// ----------------------------------------------------------------------------
+// wxFFileStream using wxFFile
+// ----------------------------------------------------------------------------
+
+class 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 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 wxFFileStream: public wxFFileInputStream, public wxFFileOutputStream {
+ public:
+  wxFFileStream(const wxString& fileName);
+};

 #endif
 #endif

+  // wxUSE_STREAMS && wxUSE_FILE
+
+#endif
+  // _WX_WXFSTREAM_H__
+