install wxUniv headers in make install and include wxUniv sources in make dist

[wxWidgets.git] / src / common / datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 2ea158faae899f365e0605206ad8845927cd86ab..f9f974012e97369dd51275b5be76cca4522c964f 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux

 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -37,6 +37,18 @@ wxDataInputStream::~wxDataInputStream()
 {
 }
 
 {
 }
 

+wxUint64 wxDataInputStream::Read64()
+{
+  wxUint64 i64;
+
+  m_input->Read(&i64, 8);
+
+  if (m_be_order)
+    return wxUINT64_SWAP_ON_LE(i64);
+  else
+    return wxUINT64_SWAP_ON_BE(i64);
+}
+

 wxUint32 wxDataInputStream::Read32()
 {
   wxUint32 i32;
 wxUint32 wxDataInputStream::Read32()
 {
   wxUint32 i32;


@@ -86,22 +98,29 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadString()
 {
 
 wxString wxDataInputStream::ReadString()
 {

-  wxString wx_string;
-  char *string;
-  unsigned long len;
+  size_t len;

 
   len = Read32();
 
   len = Read32();

-  string = new char[len+1];

 
 

-  m_input->Read(string, len);
-
-  string[len] = 0;
-  wx_string = string;
-  delete string;
-
-  return wx_string;
+  if (len > 0)
+  {
+#if wxUSE_UNICODE
+    char *tmp = new char[len + 1];
+    m_input->Read(tmp, len);
+    tmp[len] = 0;
+    wxString s(tmp);
+    delete[] tmp;
+#else
+    wxString s;
+    m_input->Read(s.GetWriteBuf(len), len);
+    s.UngetWriteBuf();
+#endif
+    return s;
+  }
+  else
+    return wxEmptyString;

 }
 }

-  
+

 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
 {
   s = ReadString();
 wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
 {
   s = ReadString();


@@ -144,6 +163,12 @@ wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
   return *this;
 }
 
   return *this;
 }
 

+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+  i = Read64();
+  return *this;
+}
+

 wxDataInputStream& wxDataInputStream::operator>>(double& i)
 {
   i = ReadDouble();
 wxDataInputStream& wxDataInputStream::operator>>(double& i)
 {
   i = ReadDouble();


@@ -169,6 +194,17 @@ wxDataOutputStream::~wxDataOutputStream()
 {
 }
 
 {
 }
 

+void wxDataOutputStream::Write64(wxUint64 i)
+{
+  wxUint64 i64;
+
+  if (m_be_order)
+    i64 = wxUINT64_SWAP_ON_LE(i);
+  else
+    i64 = wxUINT64_SWAP_ON_BE(i);
+  m_output->Write(&i64, 8);
+}
+

 void wxDataOutputStream::Write32(wxUint32 i)
 {
   wxUint32 i32;
 void wxDataOutputStream::Write32(wxUint32 i)
 {
   wxUint32 i32;


@@ -200,8 +236,9 @@ void wxDataOutputStream::Write8(wxUint8 i)
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   const wxWX2MBbuf buf = string.mb_str();
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   const wxWX2MBbuf buf = string.mb_str();

-  Write32(string.Length());
-  m_output->Write(buf, string.Len());
+  Write32(string.Len());
+  if (string.Len() > 0)
+      m_output->Write(buf, string.Len());

 }
 
 // Must be at global scope for VC++ 5
 }
 
 // Must be at global scope for VC++ 5


@@ -229,7 +266,7 @@ wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
   return *this;
 }
 
   return *this;
 }
 

-wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)

 {
   WriteString(string);
   return *this;
 {
   WriteString(string);
   return *this;


@@ -271,6 +308,12 @@ wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
   return *this;
 }
 
   return *this;
 }
 

+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
+{
+  Write64(i);
+  return *this;
+}
+

 wxDataOutputStream& wxDataOutputStream::operator<<(double f)
 {
   WriteDouble(f);
 wxDataOutputStream& wxDataOutputStream::operator<<(double f)
 {
   WriteDouble(f);


@@ -285,4 +328,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f)
 
 #endif
   // wxUSE_STREAMS
 
 #endif
   // wxUSE_STREAMS

-  
+