Changes related to stream includes

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 169c86b6274744852ebe8c6a18ad059a1d07d741..66320d1a64e8456a29a27361fa6fcbce4d528845 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -9,38 +9,46 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DATSTREAMH__
-#define __DATSTREAMH__
+#ifndef _WX_DATSTREAM_H_
+#define _WX_DATSTREAM_H_
 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
 #endif
 
-#include "wx/wx.h"
+#include <wx/stream.h>
 
-class wxDataStream {
+class wxDataInputStream: public virtual wxFilterInputStream {
 public:
-  wxDataStream(iostream& s);
-  wxDataStream(istream& s);
-  wxDataStream(ostream& s);
-
-  virtual ~wxDataStream();
+  wxDataInputStream(wxInputStream& s);
+  virtual ~wxDataInputStream();
 
   unsigned long Read32();
   unsigned short Read16();
   unsigned char Read8();
   double ReadDouble();
   wxString ReadLine();
+  wxString ReadString();
+};
+
+class wxDataOutputStream: public virtual wxFilterOutputStream {
+ public:
+  wxDataOutputStream(wxOutputStream& s);
+  virtual ~wxDataOutputStream();
 
   void Write32(unsigned long i);
   void Write16(unsigned short i);
   void Write8(unsigned char i);
   void WriteDouble(double d);
   void WriteLine(const wxString& line);
-protected:
-  istream *m_istream;
-  ostream *m_ostream;
+  void WriteString(const wxString& string);
+};
+
+class wxDataStream: public wxDataInputStream, public wxDataOutputStream,
+                    public wxFilterStream {
+ public:
+  wxDataStream(wxStream& stream);
 };
 
 #endif
-    // __HELPBASEH__
+    // _WX_DATSTREAM_H_