X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f42cff13eaba35dda3527b2ca658dd00b9e7a46..da175b2ce4dc35cc4c0baa8bbdc16bf4de6c7684:/src/common/stream.cpp diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 95947e6032..cc38a5022b 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -15,15 +15,22 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/defs.h" +#endif + +#if wxUSE_STREAMS + #include #include #include #include -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - #define BUF_TEMP_SIZE 10000 // ---------------------------------------------------------------------------- @@ -251,8 +258,8 @@ void wxStreamBuffer::PutChar(char c) return; } - if (!GetDataLeft() && !FlushBuffer()) { - CHECK_ERROR(wxStream_READ_ERR); + if (GetDataLeft() == 0 && !FlushBuffer()) { + CHECK_ERROR(wxStream_WRITE_ERR); return; } @@ -340,7 +347,7 @@ size_t wxStreamBuffer::Read(wxStreamBuffer *s_buf) if (m_mode == write) return 0; - while (bytes_read == BUF_TEMP_SIZE) { + while (bytes_read != 0) { bytes_read = Read(buf, bytes_read); bytes_read = s_buf->Write(buf, bytes_read); s += bytes_read; @@ -752,7 +759,12 @@ wxOutputStream& wxOutputStream::operator<<(const char *string) wxOutputStream& wxOutputStream::operator<<(wxString& string) { +#if wxUSE_UNICODE + const wxWX2MBbuf buf = string.mb_str(); + return *this << buf; +#else return Write(string, string.Len()); +#endif } wxOutputStream& wxOutputStream::operator<<(char c) @@ -764,32 +776,32 @@ wxOutputStream& wxOutputStream::operator<<(short i) { wxString strint; - strint.Printf("%i", i); - return Write(strint, strint.Len()); + strint.Printf(_T("%i"), i); + return *this << strint; } wxOutputStream& wxOutputStream::operator<<(int i) { wxString strint; - strint.Printf("%i", i); - return Write(strint, strint.Len()); + strint.Printf(_T("%i"), i); + return *this << strint; } wxOutputStream& wxOutputStream::operator<<(long i) { wxString strlong; - strlong.Printf("%i", i); - return Write((const char *)strlong, strlong.Len()); + strlong.Printf(_T("%i"), i); + return *this << strlong; } wxOutputStream& wxOutputStream::operator<<(double f) { wxString strfloat; - strfloat.Printf("%f", f); - return Write(strfloat, strfloat.Len()); + strfloat.Printf(_T("%f"), f); + return *this << strfloat; } #if wxUSE_SERIAL @@ -850,3 +862,6 @@ wxOutputStream& wxEndL(wxOutputStream& stream) return stream.Write("\n", 1); #endif } + +#endif + // wxUSE_STREAMS