speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 3fef67ff565de01c22c42067394e14ebacaba04d..d22e9c0f9e83a8d778072d4fb33c38758e5c0bee 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -17,17 +17,13 @@
 #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 {
-  wxFromStart, wxFromCurrent, wxFromEnd
-} wxSeekMode;
-

 class wxOutputStream;
 class wxInputStream: virtual public wxObject {
   DECLARE_ABSTRACT_CLASS(wxInputStream)
 class wxOutputStream;
 class wxInputStream: virtual public wxObject {
   DECLARE_ABSTRACT_CLASS(wxInputStream)


@@ -43,6 +39,8 @@ class wxInputStream: virtual public wxObject {
 
   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: virtual public wxObject {
 };
 
 class wxOutputStream: virtual public wxObject {


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

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

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


@@ -83,6 +75,8 @@ class wxFilterInputStream: public wxInputStream {
      { return m_parent_i_stream->Read(buffer, size); }
   virtual off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart)
      { return m_parent_i_stream->SeekI(pos, mode); }
      { return m_parent_i_stream->Read(buffer, size); }
   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(); } 


@@ -101,6 +95,8 @@ class wxFilterOutputStream: public wxOutputStream {
      { return m_parent_o_stream->Write(buffer, size); }
   virtual off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart)
      { return m_parent_o_stream->SeekO(pos, mode); }
      { return m_parent_o_stream->Write(buffer, size); }
   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 Bad() const { return m_parent_o_stream->Bad(); }
   virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); }
 
   virtual bool Bad() const { return m_parent_o_stream->Bad(); }
   virtual size_t LastWrite() const { return m_parent_o_stream->LastWrite(); }