More Motif changes (colour/font stuff)

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

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
index 530961d387d9761cad15307f520aca2bc4e2081b..76a78cf227618ce39daef22ffbf075a239889e9c 100644 (file)
--- a/include/wx/fstream.h
+++ b/include/wx/fstream.h
@@ -8,36 +8,47 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXFSTREAM_H__
-#define __WXFSTREAM_H__
+
+#ifndef _WX_WXFSTREAM_H__
+#define _WX_WXFSTREAM_H__
+
+#ifdef __GNUG__
+#pragma interface "fstream.h"
+#endif
 
 #include <wx/object.h>
 #include <wx/string.h>
 #include <wx/stream.h>
 #include <wx/file.h>
 
-class wxFileInputStream: public wxInputStream, virtual public wxFile {
+class wxFileInputStream: public wxInputStream {
  public:
-  wxFileInputStream(const wxString& fileName);
+  wxFileInputStream(const wxString& ifileName);
+  wxFileInputStream(wxFile& file);
+  wxFileInputStream(int fd);
   virtual ~wxFileInputStream();
 
   virtual char Peek();
 
-  virtual bool Eof() const { return wxFile::Eof(); }
-
-  bool Ok() const { return wxFile::IsOpened(); }
+  bool Ok() const { return m_file->IsOpened(); }
 
  protected:
-  wxFileInputStream() {}
+  wxFileInputStream();
+
+  size_t OnSysRead(void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
 
-  size_t DoRead(void *buffer, size_t size);
-  off_t DoSeekInput(off_t pos, wxSeekMode mode);
-  off_t DoTellInput() const;
+ protected:
+  wxFile *m_file;
+  bool m_file_destroy;
 };
 
-class wxFileOutputStream: public wxOutputStream, virtual public wxFile {
+class wxFileOutputStream: public wxOutputStream {
  public:
   wxFileOutputStream(const wxString& fileName);
+  wxFileOutputStream(wxFile& file);
+  wxFileOutputStream(int fd);
   virtual ~wxFileOutputStream();
 
   // To solve an ambiguity on GCC
@@ -46,20 +57,18 @@ class wxFileOutputStream: public wxOutputStream, virtual public wxFile {
 
   void Sync();
 
-  bool Ok() const { return wxFile::IsOpened(); }
+  bool Ok() const { return m_file->IsOpened(); }
 
  protected:
-  wxFileOutputStream() {}
+  wxFileOutputStream();
 
-  size_t DoWrite(const void *buffer, size_t size);
-  off_t DoSeekOutput(off_t pos, wxSeekMode mode);
-  off_t DoTellOutput() const;
-};
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
 
-class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
- public:
-  wxFileStream(const wxString& fileName);
-  virtual ~wxFileStream();
+ protected:
+  wxFile *m_file;
+  bool m_file_destroy;
 };
 
 #endif