optimizations: more functions made inline, added Alloc()/Shrink() function for

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index a0800e136807160473448c1f67fdba8d6172358c..d22e9c0f9e83a8d778072d4fb33c38758e5c0bee 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -17,19 +17,15 @@
 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

-#include <wx/object.h>
-#include <wx/string.h>
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/filefn.h"  // for off_t and wxSeekMode

 
 /*
  * wxStream: base classes
  */
 
 /*
  * wxStream: base classes
  */

-
-typedef enum {
-  wxBeginPosition = 0, wxCurrentPosition = 1, wxEndPosition = 2
-} wxWhenceType;
-

 class wxOutputStream;
 class wxOutputStream;

-class wxInputStream: public wxObject {
+class wxInputStream: virtual public wxObject {

   DECLARE_ABSTRACT_CLASS(wxInputStream)
  public:
   wxInputStream();
   DECLARE_ABSTRACT_CLASS(wxInputStream)
  public:
   wxInputStream();


@@ -38,14 +34,16 @@ class wxInputStream: public wxObject {
   virtual wxInputStream& Read(void *buffer, size_t size) = 0;
   wxInputStream& Read(wxOutputStream& stream_out);
 
   virtual wxInputStream& Read(void *buffer, size_t size) = 0;
   wxInputStream& Read(wxOutputStream& stream_out);
 

-  virtual size_t SeekI(int pos, wxWhenceType whence = wxBeginPosition) = 0;
-  virtual size_t TellI() const = 0;
+  virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart) = 0;
+  virtual off_t TellI() const = 0;

 
   virtual bool Eof() const = 0;
   virtual size_t LastRead() const = 0;
 
   virtual bool Eof() const = 0;
   virtual size_t LastRead() const = 0;

+
+  wxInputStream& operator>>(wxOutputStream& out) { return Read(out); }

 };
 
 };
 

-class wxOutputStream: public wxObject {
+class wxOutputStream: virtual public wxObject {

   DECLARE_ABSTRACT_CLASS(wxOutputStream)
  public:
   wxOutputStream();
   DECLARE_ABSTRACT_CLASS(wxOutputStream)
  public:
   wxOutputStream();


@@ -54,8 +52,8 @@ class wxOutputStream: public wxObject {
   virtual wxOutputStream& Write(const void *buffer, size_t size) = 0;
   wxOutputStream& Write(wxInputStream& stream_in);
 
   virtual wxOutputStream& Write(const void *buffer, size_t size) = 0;
   wxOutputStream& Write(wxInputStream& stream_in);
 

-  virtual size_t SeekO(int pos, wxWhenceType whence = wxBeginPosition) = 0;
-  virtual size_t TellO() const = 0;
+  virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart) = 0;
+  virtual off_t TellO() const = 0;

 
   virtual bool Bad() const = 0;
   virtual size_t LastWrite() const = 0;
 
   virtual bool Bad() const = 0;
   virtual size_t LastWrite() const = 0;


@@ -63,13 +61,6 @@ class wxOutputStream: public wxObject {
   virtual void Sync() {}
 };
 
   virtual void Sync() {}
 };
 

-class wxStream: public wxInputStream, public wxOutputStream {
-  DECLARE_ABSTRACT_CLASS(wxStream)
- public:
-  wxStream() : wxInputStream(), wxOutputStream() {}
-  virtual ~wxStream() {}
-};
-

 /*
  * "Filter" streams
  */
 /*
  * "Filter" streams
  */


@@ -82,16 +73,19 @@ class wxFilterInputStream: public wxInputStream {
 
   virtual wxInputStream& Read(void *buffer, size_t size)
      { return m_parent_i_stream->Read(buffer, size); }
 
   virtual wxInputStream& Read(void *buffer, size_t size)
      { return m_parent_i_stream->Read(buffer, size); }

-  virtual size_t SeekI(int pos, wxWhenceType whence = wxBeginPosition)
-     { return m_parent_i_stream->SeekI(pos, whence); }
+  virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart)
+     { return m_parent_i_stream->SeekI(pos, mode); }
+  virtual off_t TellI() const
+     { return m_parent_i_stream->TellI(); }

 
   virtual bool Eof() const { return m_parent_i_stream->Eof(); } 
   virtual size_t LastRead() const { return m_parent_i_stream->LastRead(); } 
 
   virtual bool Eof() const { return m_parent_i_stream->Eof(); } 
   virtual size_t LastRead() const { return m_parent_i_stream->LastRead(); } 

+

  protected:
   wxInputStream *m_parent_i_stream;
 };
 
  protected:
   wxInputStream *m_parent_i_stream;
 };
 

-class wxFilterOuputStream: pubilc wxOutputStream {
+class wxFilterOutputStream: public wxOutputStream {

   DECLARE_CLASS(wxFilterOutputStream)
  public:
   wxFilterOutputStream(wxOutputStream& stream);
   DECLARE_CLASS(wxFilterOutputStream)
  public:
   wxFilterOutputStream(wxOutputStream& stream);


@@ -99,11 +93,13 @@ class wxFilterOuputStream: pubilc wxOutputStream {
 
   virtual wxOutputStream& Write(const void *buffer, size_t size)
      { return m_parent_o_stream->Write(buffer, size); }
 
   virtual wxOutputStream& Write(const void *buffer, size_t size)
      { return m_parent_o_stream->Write(buffer, size); }

-  virtual size_t SeekO(int pos, wxWhenceType whence = wxBeginPosition)
-     { return m_parent_o_stream->SeekO(pos, whence); }
+  virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart)
+     { return m_parent_o_stream->SeekO(pos, mode); }
+  virtual off_t TellO() const
+     { return m_parent_o_stream->TellO(); }

 
 

-  virtual bool Eof() const { return m_parent_o_sream->Eof(); }
-  virtual size_t LastRead() const { return m_parent_o_stream->LastRead(); }
+  virtual bool Bad() const { return m_parent_o_stream->Bad(); }
+  virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); }

 
  protected:
   wxOutputStream *m_parent_o_stream;
 
  protected:
   wxOutputStream *m_parent_o_stream;