16-bit fixes

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 66320d1a64e8456a29a27361fa6fcbce4d528845..6ba074de71774282b8e904308d65428067612629 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -16,39 +16,67 @@
 #pragma interface "datstrm.h"
 #endif
 
-#include <wx/stream.h>
+#include "wx/stream.h"
 
-class wxDataInputStream: public virtual wxFilterInputStream {
+#if wxUSE_STREAMS
+
+class WXDLLEXPORT wxDataInputStream {
 public:
   wxDataInputStream(wxInputStream& s);
-  virtual ~wxDataInputStream();
+  ~wxDataInputStream();
 
-  unsigned long Read32();
-  unsigned short Read16();
-  unsigned char Read8();
+  wxUint32 Read32();
+  wxUint16 Read16();
+  wxUint8 Read8();
   double ReadDouble();
-  wxString ReadLine();
   wxString ReadString();
+
+  wxDataInputStream& operator>>(wxString& s);
+  wxDataInputStream& operator>>(wxInt8& c);
+  wxDataInputStream& operator>>(wxInt16& i);
+  wxDataInputStream& operator>>(wxInt32& i);
+  wxDataInputStream& operator>>(wxUint8& c);
+  wxDataInputStream& operator>>(wxUint16& i);
+  wxDataInputStream& operator>>(wxUint32& i);
+  wxDataInputStream& operator>>(double& i);
+  wxDataInputStream& operator>>(float& f);
+
+  void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
+ protected:
+  wxInputStream *m_input;
+  bool m_be_order;
 };
 
-class wxDataOutputStream: public virtual wxFilterOutputStream {
+class WXDLLEXPORT wxDataOutputStream {
  public:
   wxDataOutputStream(wxOutputStream& s);
-  virtual ~wxDataOutputStream();
+  ~wxDataOutputStream();
 
-  void Write32(unsigned long i);
-  void Write16(unsigned short i);
-  void Write8(unsigned char i);
+  void Write32(wxUint32 i);
+  void Write16(wxUint16 i);
+  void Write8(wxUint8 i);
   void WriteDouble(double d);
-  void WriteLine(const wxString& line);
   void WriteString(const wxString& string);
-};
 
-class wxDataStream: public wxDataInputStream, public wxDataOutputStream,
-                    public wxFilterStream {
- public:
-  wxDataStream(wxStream& stream);
+  wxDataOutputStream& operator<<(const wxChar *string);
+  wxDataOutputStream& operator<<(wxString& string);
+  wxDataOutputStream& operator<<(wxInt8 c);
+  wxDataOutputStream& operator<<(wxInt16 i);
+  wxDataOutputStream& operator<<(wxInt32 i);
+  wxDataOutputStream& operator<<(wxUint8 c);
+  wxDataOutputStream& operator<<(wxUint16 i);
+  wxDataOutputStream& operator<<(wxUint32 i);
+  wxDataOutputStream& operator<<(double f);
+  wxDataOutputStream& operator<<(float f);
+
+  void BigEndianOrdered(bool be_order) { m_be_order = be_order; } 
+ protected:
+  wxOutputStream *m_output;
+  bool m_be_order;
 };
 
+#endif
+  // wxUSE_STREAMS
+
 #endif
     // _WX_DATSTREAM_H_