* Fixes.

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

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
index 2c1f320f855f8a23a2ba67b98467d59a146671ab..b67ba0800e3000df2a5adcfd9529cbbdea15e95a 100644 (file)
--- a/include/wx/fstream.h
+++ b/include/wx/fstream.h
@@ -21,41 +21,35 @@
 #include <wx/stream.h>
 #include <wx/file.h>
 
-// Disable warnings such as
-// 'wxFileStream' : inherits 'wxFileInputStream::Peek' via dominance
-
-#ifdef _MSC_VER
-#pragma warning(disable:4250)
-#endif
-
-class wxFileStreamBase {
-protected:
-  wxFile *m_file;
-  bool m_file_destroy;
-};
-
-class wxFileInputStream: public virtual wxInputStream,
-                         public virtual wxFileStreamBase {
+class wxFileInputStream: public wxInputStream {
  public:
-  wxFileInputStream(const wxString& fileName);
-  virtual ~wxFileInputStream();
+  wxFileInputStream(const wxString& ifileName);
+  wxFileInputStream(wxFile& file);
+  wxFileInputStream(int fd);
+  ~wxFileInputStream();
 
-  virtual char Peek();
+  char Peek();
+  size_t StreamSize() const;
 
   bool Ok() const { return m_file->IsOpened(); }
 
  protected:
   wxFileInputStream();
 
-  size_t DoRead(void *buffer, size_t size);
-  off_t DoSeekInput(off_t pos, wxSeekMode mode);
-  off_t DoTellInput() const;
+  size_t OnSysRead(void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  wxFile *m_file;
+  bool m_file_destroy;
 };
 
-class wxFileOutputStream: public virtual wxOutputStream,
-                          public virtual wxFileStreamBase {
+class wxFileOutputStream: public wxOutputStream {
  public:
   wxFileOutputStream(const wxString& fileName);
+  wxFileOutputStream(wxFile& file);
+  wxFileOutputStream(int fd);
   virtual ~wxFileOutputStream();
 
   // To solve an ambiguity on GCC
@@ -63,26 +57,25 @@ class wxFileOutputStream: public virtual wxOutputStream,
      { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
+  size_t StreamSize() const;
 
   bool Ok() const { return m_file->IsOpened(); }
 
  protected:
   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;
+
+ protected:
+  wxFile *m_file;
+  bool m_file_destroy;
 };
 
-class wxFileStream: public wxStream,
-                    public wxFileInputStream, public wxFileOutputStream {
+class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
  public:
   wxFileStream(const wxString& fileName);
-  virtual ~wxFileStream();
 };
 
-#ifdef _MSC_VER
-#pragma warning(default:4250)
-#endif
-
 #endif