#if wxUSE_STREAMS
+#ifndef WX_PRECOMP
+ #include "wx/crt.h"
+#endif
+
#include "wx/txtstrm.h"
#include <ctype.h>
memset((void*)m_lastBytes, 0, 10);
for(size_t inlen = 0; inlen < 9; inlen++)
{
+ if (!m_input.CanRead())
+ return wxEOT;
+
// actually read the next character
m_lastBytes[inlen] = m_input.GetC();
// there should be no encoding which requires more than nine bytes for one character...
return wxEOT;
#else
+ if (!m_input.CanRead())
+ return wxEOT;
+
m_lastBytes[0] = m_input.GetC();
if(m_input.LastRead() <= 0)
}
#if wxUSE_UNICODE
- wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
+ // FIXME-UTF8: use wxCharBufferWithLength if/when we have it
+ wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len);
m_output.Write(buffer, len);
#else
m_output.Write(out.c_str(), out.length() );
return *this;
}
-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
-{
- WriteString( wxString(string) );
- return *this;
-}
-
wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
{
WriteString( string );