* Renamed fstream.h in wfstream.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
deleted file mode 100644 (file)
index b67ba08..0000000
--- a/include/wx/fstream.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        fstream.h
-// Purpose:     File stream classes
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     11/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#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 {
- public:
-  wxFileInputStream(const wxString& ifileName);
-  wxFileInputStream(wxFile& file);
-  wxFileInputStream(int fd);
-  ~wxFileInputStream();
-
-  char Peek();
-  size_t StreamSize() const;
-
-  bool Ok() const { return m_file->IsOpened(); }
-
- protected:
-  wxFileInputStream();
-
-  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 wxOutputStream {
- public:
-  wxFileOutputStream(const wxString& fileName);
-  wxFileOutputStream(wxFile& file);
-  wxFileOutputStream(int fd);
-  virtual ~wxFileOutputStream();
-
-  // To solve an ambiguity on GCC
-  inline wxOutputStream& Write(const void *buffer, size_t size)
-     { return wxOutputStream::Write(buffer, size); }
-
-  void Sync();
-  size_t StreamSize() const;
-
-  bool Ok() const { return m_file->IsOpened(); }
-
- protected:
-  wxFileOutputStream();
-
-  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 wxFileInputStream, public wxFileOutputStream {
- public:
-  wxFileStream(const wxString& fileName);
-};
-
-#endif

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
new file mode 100644 (file)
index 0000000..29f13ca
--- /dev/null
+++ b/include/wx/wfstream.h
@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wfstream.h
+// Purpose:     File stream classes
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     11/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WXFSTREAM_H__
+#define _WX_WXFSTREAM_H__
+
+#ifdef __GNUG__
+#pragma interface "wfstream.h"
+#endif
+
+#include <wx/object.h>
+#include <wx/string.h>
+#include <wx/stream.h>
+#include <wx/file.h>
+
+class wxFileInputStream: public wxInputStream {
+ public:
+  wxFileInputStream(const wxString& ifileName);
+  wxFileInputStream(wxFile& file);
+  wxFileInputStream(int fd);
+  ~wxFileInputStream();
+
+  char Peek();
+  size_t StreamSize() const;
+
+  bool Ok() const { return m_file->IsOpened(); }
+
+ protected:
+  wxFileInputStream();
+
+  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 wxOutputStream {
+ public:
+  wxFileOutputStream(const wxString& fileName);
+  wxFileOutputStream(wxFile& file);
+  wxFileOutputStream(int fd);
+  virtual ~wxFileOutputStream();
+
+  // To solve an ambiguity on GCC
+  inline wxOutputStream& Write(const void *buffer, size_t size)
+     { return wxOutputStream::Write(buffer, size); }
+
+  void Sync();
+  size_t StreamSize() const;
+
+  bool Ok() const { return m_file->IsOpened(); }
+
+ protected:
+  wxFileOutputStream();
+
+  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 wxFileInputStream, public wxFileOutputStream {
+ public:
+  wxFileStream(const wxString& fileName);
+};
+
+#endif