///////////////////////////////////////////////////////////////////////////////
-// Name: txtstrm.cpp
+// Name: src/common/txtstrm.cpp
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
// Created: 28/06/98
-// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
// 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
#include "wx/txtstrm.h"
-#include <ctype.h>
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/crt.h"
+#endif
-// Unix: "\n"
-// Dos: "\r\n"
-// Mac: "\r"
+#include <ctype.h>
// ----------------------------------------------------------------------------
// wxTextInputStream
// ----------------------------------------------------------------------------
#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()
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
- return wbuf[0];
+ switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+ {
+ case 0:
+ // this is a bug in converter object as it should either fail
+ // or decode non-empty string to something non-empty
+ wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+ break;
+
+ case wxCONV_FAILED:
+ // the buffer probably doesn't contain enough bytes to decode
+ // as a complete character, try with more bytes
+ break;
+
+ default:
+ // if we couldn't decode a single character during the last
+ // loop iteration we shouldn't be able to decode 2 or more of
+ // them with an extra single byte, something fishy is going on
+ wxFAIL_MSG("unexpected decoding result");
+ // fall through nevertheless and return at least something
+
+ case 1:
+ // we finally decoded a character
+ return wbuf[0];
+ }
}
- // there should be no encoding which requires more than nine bytes for one character...
+
+ // there should be no encoding which requires more than nine bytes for one
+ // character so something must be wrong with our conversion but we have no
+ // way to signal it from here
return wxEOT;
#else
m_lastBytes[0] = m_input.GetC();
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();
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(c == wxEOT)
break;
- if (m_separators.Contains(c))
+ if (m_separators.Find(c) >= 0)
break;
if (EatEOL(c))
#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)
m_mode = mode;
if (m_mode == wxEOL_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
wxTextOutputStream::~wxTextOutputStream()
{
+#if wxUSE_UNICODE
+ delete m_conv;
+#endif // wxUSE_UNICODE
}
void wxTextOutputStream::SetMode(wxEOL mode)
m_mode = mode;
if (m_mode == wxEOL_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__WXPM__)
m_mode = wxEOL_DOS;
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- m_mode = wxEOL_MAC;
#else
m_mode = wxEOL_UNIX;
#endif
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);
}
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:
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)
+void wxTextOutputStream::Flush()
{
- WriteString( wxString(string) );
- return *this;
+#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)
wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
{
- WriteString( wxString(&wc, m_conv, 1) );
+ WriteString( wxString(&wc, *m_conv, 1) );
return *this;
}
projects / wxWidgets.git / blobdiff