fixed typo in wxString::swap() which was completely broken

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 1f692499cc79937848ed88d5f708f0ce239cb943..a222f1bc1aa48112e354e474819745448bef9fed 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/stream.h"
 #endif
 
 #include "wx/stream.h"

+#include "wx/longlong.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 


@@ -25,7 +26,10 @@ class WXDLLEXPORT wxDataInputStream
 public:
     wxDataInputStream(wxInputStream& s);
     ~wxDataInputStream();
 public:
     wxDataInputStream(wxInputStream& s);
     ~wxDataInputStream();

+    
+    bool IsOk() { return m_input->IsOk(); }

 
 

+    wxUint64 Read64();

     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();
     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();


@@ -39,11 +43,12 @@ public:
     wxDataInputStream& operator>>(wxUint8& c);
     wxDataInputStream& operator>>(wxUint16& i);
     wxDataInputStream& operator>>(wxUint32& 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; }
     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;
 protected:
     wxInputStream *m_input;
     bool m_be_order;


@@ -55,6 +60,9 @@ public:
     wxDataOutputStream(wxOutputStream& s);
     ~wxDataOutputStream();
 
     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 Write32(wxUint32 i);
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);


@@ -62,18 +70,19 @@ public:
     void WriteString(const wxString& string);
 
     wxDataOutputStream& operator<<(const wxChar *string);
     void WriteString(const wxString& string);
 
     wxDataOutputStream& operator<<(const wxChar *string);

-    wxDataOutputStream& operator<<(wxString& 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<<(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);
 
     wxDataOutputStream& operator<<(double f);
     wxDataOutputStream& operator<<(float f);
 

-    void BigEndianOrdered(bool be_order) { m_be_order = be_order; } 
-  
+    void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
+

 protected:
     wxOutputStream *m_output;
     bool m_be_order;
 protected:
     wxOutputStream *m_output;
     bool m_be_order;