///////////////////////////////////////////////////////////////////////////////
-// Name: txtstrm.cpp
+// Name: src/common/txtstrm.cpp
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
#if wxUSE_STREAMS
+#ifndef WX_PRECOMP
+ #include "wx/crt.h"
+#endif
+
#include "wx/txtstrm.h"
#include <ctype.h>
if(m_input.LastRead() <= 0)
return wxEOT;
- int retlen = (int) m_conv->MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
- if(retlen >= 0) // res == 0 could happen for '\0' char
+ if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
+ != wxCONV_FAILED )
return wbuf[0];
}
// there should be no encoding which requires more than nine bytes for one character...
return wxStrtod(word.c_str(), 0);
}
+#if WXWIN_COMPATIBILITY_2_6
+
wxString wxTextInputStream::ReadString()
{
return ReadLine();
}
+#endif // WXWIN_COMPATIBILITY_2_6
+
wxString wxTextInputStream::ReadLine()
{
wxString line;
if(c == wxEOT)
break;
- if ( !m_input )
- break;
-
if (EatEOL(c))
break;
out << c;
}
- // We must not write the trailing NULL here
#if wxUSE_UNICODE
- wxCharBuffer buffer = m_conv->cWC2MB( out );
- m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+ // 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() );
#endif
return *this;
}
-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
-{
- WriteString( wxString(string) );
- return *this;
-}
-
wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
{
WriteString( string );