Various small fixes

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index b5bd8a166451ed5b58abcbf1344a0b9a113d11b7..82e7b8daa979e5142e79ce5c3e6d74240a9407eb 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -9,22 +9,19 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DATSTREAMH__
-#define __DATSTREAMH__
+#ifndef _WX_DATSTREAM_H_
+#define _WX_DATSTREAM_H_

 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
 #endif
 
 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
 #endif
 

-#include "wx/wx.h"
+#include <wx/stream.h>

 
 

-class wxDataStream {
+class WXDLLEXPORT wxDataInputStream: public wxFilterInputStream {

 public:
 public:

-  wxDataStream(iostream& s);
-  wxDataStream(istream& s);
-  wxDataStream(ostream& s);
-
-  virtual ~wxDataStream();
+  wxDataInputStream(wxInputStream& s);
+  virtual ~wxDataInputStream();

 
   unsigned long Read32();
   unsigned short Read16();
 
   unsigned long Read32();
   unsigned short Read16();


@@ -32,6 +29,12 @@ public:
   double ReadDouble();
   wxString ReadLine();
   wxString ReadString();
   double ReadDouble();
   wxString ReadLine();
   wxString ReadString();

+};
+
+class WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {
+ public:
+  wxDataOutputStream(wxOutputStream& s);
+  virtual ~wxDataOutputStream();

 
   void Write32(unsigned long i);
   void Write16(unsigned short i);
 
   void Write32(unsigned long i);
   void Write16(unsigned short i);


@@ -39,10 +42,7 @@ public:
   void WriteDouble(double d);
   void WriteLine(const wxString& line);
   void WriteString(const wxString& string);
   void WriteDouble(double d);
   void WriteLine(const wxString& line);
   void WriteString(const wxString& string);

-protected:
-  istream *m_istream;
-  ostream *m_ostream;

 };
 
 #endif
 };
 
 #endif

-    // __HELPBASEH__
+    // _WX_DATSTREAM_H_