X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75ed1d15d0d866cac78f7c0da176db8dd5288bc8..9626e0bfc6ae68c9068cdca7a9a43c8e820c5eb9:/src/common/datstrm.cpp?ds=sidebyside diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index d455a6dc4e..bdf796f7c2 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -171,18 +171,18 @@ void wxDataOutputStream::Write8(unsigned char i) void wxDataOutputStream::WriteLine(const wxString& line) { #ifdef __WXMSW__ - wxString tmp_string = line + "\r\n"; + wxString tmp_string = line + _T("\r\n"); #else - wxString tmp_string = line + '\n'; + wxString tmp_string = line + _T('\n'); #endif - Write((const char *) tmp_string, tmp_string.Length()); + Write((const wxChar *) tmp_string, tmp_string.Length()*sizeof(wxChar)); } void wxDataOutputStream::WriteString(const wxString& string) { Write32(string.Length()); - Write((const char *) string, string.Length()); + Write((const wxChar *) string, string.Length()*sizeof(wxChar)); } // Must be at global scope for VC++ 5 @@ -195,7 +195,7 @@ void wxDataOutputStream::WriteDouble(double d) #if wxUSE_APPLE_IEEE ConvertToIeeeExtended(d, (unsigned char *)buf); #else -# pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!" +# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" buf[0] = '\0'; #endif Write(buf, 10);