better spacing

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 4b37033048d74a0186b4bddb905b23093a4157f2..b0ef8302a254b680a0c9c328a9f2224772ccf3c2 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -113,14 +113,14 @@ wxString wxDataInputStream::ReadString()
     char *tmp = new char[len + 1];
     m_input->Read(tmp, len);
     tmp[len] = 0;
-    wxString s(tmp, m_conv);
+    wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) );
     delete[] tmp;
 #else
-    wxString s;
-    m_input->Read(s.GetWriteBuf(len), len);
-    s.UngetWriteBuf();
+    wxString ret;
+    m_input->Read( ret.GetWriteBuf(len), len);
+    ret.UngetWriteBuf();
 #endif
-    return s;
+    return ret;
   }
   else
     return wxEmptyString;