///////////////////////////////////////////////////////////////////////////////
-// Name: txtstrm.cpp
+// Name: src/common/txtstrm.cpp
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "txtstrm.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_STREAMS
+#ifndef WX_PRECOMP
+ #include "wx/crt.h"
+#endif
+
#include "wx/txtstrm.h"
#include <ctype.h>
// ----------------------------------------------------------------------------
#if wxUSE_UNICODE
-wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
- : m_input(s), m_separators(sep), m_conv(conv)
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+ const wxString &sep,
+ const wxMBConv& conv)
+ : m_input(s), m_separators(sep), m_conv(conv.Clone())
{
memset((void*)m_lastBytes, 0, 10);
}
wxTextInputStream::~wxTextInputStream()
{
+#if wxUSE_UNICODE
+ delete m_conv;
+#endif // wxUSE_UNICODE
}
void wxTextInputStream::UngetLast()
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();
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 wxEOT;
#else
+ if (!m_input.CanRead())
+ return wxEOT;
+
m_lastBytes[0] = m_input.GetC();
if(m_input.LastRead() <= 0)
if(!m_input) return 0;
wxString word = ReadWord();
- if(word.IsEmpty())
+ if(word.empty())
return 0;
return wxStrtoul(word.c_str(), 0, base);
}
if(!m_input) return 0;
wxString word = ReadWord();
- if(word.IsEmpty())
+ if(word.empty())
return 0;
return wxStrtol(word.c_str(), 0, base);
}
{
if(!m_input) return 0;
wxString word = ReadWord();
- if(word.IsEmpty())
+ if(word.empty())
return 0;
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;
#if wxUSE_UNICODE
-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
- : m_output(s), m_conv(conv)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+ wxEOL mode,
+ const wxMBConv& conv)
+ : m_output(s), m_conv(conv.Clone())
#else
wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
: m_output(s)
wxTextOutputStream::~wxTextOutputStream()
{
+#if wxUSE_UNICODE
+ delete m_conv;
+#endif // wxUSE_UNICODE
}
void wxTextOutputStream::SetMode(wxEOL mode)
void wxTextOutputStream::Write16(wxUint16 i)
{
wxString str;
- str.Printf(wxT("%u"), i);
+ str.Printf(wxT("%u"), (unsigned)i);
WriteString(str);
}
void wxTextOutputStream::Write8(wxUint8 i)
{
wxString str;
- str.Printf(wxT("%u"), i);
+ str.Printf(wxT("%u"), (unsigned)i);
WriteString(str);
}
}
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
wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
{
#if wxUSE_UNICODE
- WriteString( wxString(&c, m_conv, 1) );
+ WriteString( wxString(&c, *m_conv, 1) );
#else
WriteString( wxString(&c, wxConvLocal, 1) );
#endif
return *this;
}
-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
-{
- WriteString( wxString(string) );
- return *this;
-}
-
wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
{
WriteString( string );
wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
{
- WriteString( wxString(&wc, m_conv, 1) );
+ WriteString( wxString(&wc, *m_conv, 1) );
return *this;
}