More unicode related cleanup and fixes for wxPython

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 7b0fa1a613ab076ec83d3d0ed44e0ed747d1911a..a222f1bc1aa48112e354e474819745448bef9fed 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -16,63 +16,76 @@
 #pragma interface "datstrm.h"
 #endif
 
 #pragma interface "datstrm.h"
 #endif
 

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

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class WXDLLEXPORT wxDataInputStream {
+class WXDLLEXPORT wxDataInputStream
+{

 public:
 public:

-  wxDataInputStream(wxInputStream& s);
-  ~wxDataInputStream();
-
-  wxUint32 Read32();
-  wxUint16 Read16();
-  wxUint8 Read8();
-  double ReadDouble();
-  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;
+    wxDataInputStream(wxInputStream& s);
+    ~wxDataInputStream();
+    
+    bool IsOk() { return m_input->IsOk(); }
+
+    wxUint64 Read64();
+    wxUint32 Read32();
+    wxUint16 Read16();
+    wxUint8 Read8();
+    double ReadDouble();
+    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>>(wxUint64& 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 WXDLLEXPORT wxDataOutputStream {
- public:
-  wxDataOutputStream(wxOutputStream& s);
-  ~wxDataOutputStream();
-
-  void Write32(wxUint32 i);
-  void Write16(wxUint16 i);
-  void Write8(wxUint8 i);
-  void WriteDouble(double d);
-  void WriteString(const wxString& string);
-
-  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;
+class WXDLLEXPORT wxDataOutputStream
+{
+public:
+    wxDataOutputStream(wxOutputStream& s);
+    ~wxDataOutputStream();
+
+    bool IsOk() { return m_output->IsOk(); }
+
+    void Write64(wxUint64 i);
+    void Write32(wxUint32 i);
+    void Write16(wxUint16 i);
+    void Write8(wxUint8 i);
+    void WriteDouble(double d);
+    void WriteString(const wxString& string);
+
+    wxDataOutputStream& operator<<(const wxChar *string);
+    wxDataOutputStream& operator<<(const 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<<(wxUint64 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
 };
 
 #endif