no need to check for wxID_HELP buttons in SetLabel() now that it's overridden in...

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 50e4eb4b2e6dc2b81e1d0d76c54523258481e726..e480fef05e4f24804caddadfe1f56a749b56d136 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -45,6 +45,14 @@ wxDataInputStream::~wxDataInputStream()
 #endif // wxUSE_UNICODE
 }
 
 #endif // wxUSE_UNICODE
 }
 

+#if wxUSE_UNICODE
+void wxDataInputStream::SetConv( const wxMBConv &conv )
+{
+    delete m_conv;
+    m_conv = conv.Clone();
+}
+#endif
+

 #if wxHAS_INT64
 wxUint64 wxDataInputStream::Read64()
 {
 #if wxHAS_INT64
 wxUint64 wxDataInputStream::Read64()
 {


@@ -92,7 +100,7 @@ double wxDataInputStream::ReadDouble()
   char buf[10];
 
   m_input->Read(buf, 10);
   char buf[10];
 
   m_input->Read(buf, 10);

-  return ConvertFromIeeeExtended((const wxInt8 *)buf);
+  return wxConvertFromIeeeExtended((const wxInt8 *)buf);

 #else
   return 0.0;
 #endif
 #else
   return 0.0;
 #endif


@@ -100,25 +108,27 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadString()
 {
 
 wxString wxDataInputStream::ReadString()
 {

-  size_t len;
-
-  len = Read32();
+    wxString ret;

 
 

-  if (len > 0)
-  {
+    const size_t len = Read32();
+    if ( len > 0 )
+    {

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxCharBuffer tmp(len + 1);
-    m_input->Read(tmp.data(), len);
-    tmp.data()[len] = '\0';
-    wxString ret(m_conv->cMB2WX(tmp.data()));
+        wxCharBuffer tmp(len + 1);
+        if ( tmp )
+        {
+            m_input->Read(tmp.data(), len);
+            tmp.data()[len] = '\0';
+            ret = m_conv->cMB2WX(tmp.data());
+        }

 #else
 #else

-    wxString ret;
-    m_input->Read( wxStringBuffer(ret, len), len);
+        wxStringBuffer buf(ret, len);
+        if ( buf )
+            m_input->Read(buf, len);

 #endif
 #endif

+    }
+

     return ret;
     return ret;

-  }
-  else
-    return wxEmptyString;

 }
 
 #if wxUSE_LONGLONG
 }
 
 #if wxUSE_LONGLONG


@@ -471,6 +481,14 @@ wxDataOutputStream::~wxDataOutputStream()
 #endif // wxUSE_UNICODE
 }
 
 #endif // wxUSE_UNICODE
 }
 

+#if wxUSE_UNICODE
+void wxDataOutputStream::SetConv( const wxMBConv &conv )
+{
+    delete m_conv;
+    m_conv = conv.Clone();
+}
+#endif
+

 #if wxHAS_INT64
 void wxDataOutputStream::Write64(wxUint64 i)
 {
 #if wxHAS_INT64
 void wxDataOutputStream::Write64(wxUint64 i)
 {


@@ -529,8 +547,9 @@ void wxDataOutputStream::WriteDouble(double d)
   char buf[10];
 
 #if wxUSE_APPLE_IEEE
   char buf[10];
 
 #if wxUSE_APPLE_IEEE

-  ConvertToIeeeExtended(d, (wxInt8 *)buf);
+  wxConvertToIeeeExtended(d, (wxInt8 *)buf);

 #else
 #else

+  wxUnusedVar(d);

 #if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #endif
 #if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #endif


@@ -650,13 +669,6 @@ void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
   }
 }
 
   }
 }
 

-wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
-{
-  Write32(wxStrlen(string));
-  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
-  return *this;
-}
-

 wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);
 wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);