#if wxUSE_STREAMS
+#include "wx/txtstrm.h"
+
#ifndef WX_PRECOMP
#include "wx/crt.h"
#endif
-#include "wx/txtstrm.h"
#include <ctype.h>
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos: "\r\n"
-// Mac: "\r"
-
// ----------------------------------------------------------------------------
// wxTextInputStream
// ----------------------------------------------------------------------------
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 (c != wxT('\n') &&
c != wxT('\r') &&
- !m_separators.Contains(c))
+ m_separators.Find(c) < 0)
return c;
}
wxUint32 wxTextInputStream::Read32(int base)
{
- wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+ wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
if(!m_input) return 0;
wxString word = ReadWord();
wxInt32 wxTextInputStream::Read32S(int base)
{
- wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+ wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
if(!m_input) return 0;
wxString word = ReadWord();
if(c == wxEOT)
break;
- if (m_separators.Contains(c))
+ if (m_separators.Find(c) >= 0)
break;
if (EatEOL(c))
{
#if defined(__WXMSW__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
{
#if defined(__WXMSW__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
switch ( m_mode )
{
case wxEOL_DOS:
- out << _T("\r\n");
+ out << wxT("\r\n");
continue;
case wxEOL_MAC:
- out << _T('\r');
+ out << wxT('\r');
continue;
default:
- wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+ wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );
// fall through
case wxEOL_UNIX:
return *this;
}
+void wxTextOutputStream::Flush()
+{
+#if wxUSE_UNICODE
+ const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
+ if ( len > m_conv->GetMBNulLen() )
+ {
+ wxCharBuffer buf(len);
+ m_conv->FromWChar(buf.data(), len, L"", 1);
+ m_output.Write(buf, len - m_conv->GetMBNulLen());
+ }
+#endif // wxUSE_UNICODE
+}
+
wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
{
WriteString( string );