X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd6ce4a90c11b54cc00799d0e4611d858739a749..dd91da4ed1e9d2ba5d3bc2fae64a8e4ea86b5d41:/src/common/txtstrm.cpp diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index ae71ae5d21..62f2e5f72c 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -38,10 +38,17 @@ // wxTextInputStream // ---------------------------------------------------------------------------- +#if wxUSE_UNICODE +wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv) + : m_input(s), m_separators(sep), m_conv(conv) +{ +} +#else wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep) : m_input(s), m_separators(sep) { } +#endif wxTextInputStream::~wxTextInputStream() { @@ -63,20 +70,20 @@ wxChar wxTextInputStream::NextNonSeparators() } -inline bool wxTextInputStream::EatEOL(const wxChar &c) +bool wxTextInputStream::EatEOL(const wxChar &c) { - if (c == wxT('\n')) return TRUE; // eat on UNIX + if (c == wxT('\n')) return TRUE; // eat on UNIX - if (c == wxT('\r')) // eat on both Mac and DOS + if (c == wxT('\r')) // eat on both Mac and DOS { - if (!m_input) return TRUE; - wxChar c2 = m_input.GetC(); + if (!m_input) return TRUE; + wxChar c2 = m_input.GetC(); - if (c2 != wxT('\n')) m_input.Ungetch( c2 ); // Don't eat on Mac - return TRUE; + if (c2 != wxT('\n')) m_input.Ungetch( c2 ); // Don't eat on Mac + return TRUE; } - return FALSE; + return FALSE; } void wxTextInputStream::SkipIfEndOfLine( wxChar c ) @@ -143,12 +150,16 @@ wxUint8 wxTextInputStream::Read8() double wxTextInputStream::ReadDouble() { - /* I only implemented a simple float parser */ - // VZ: what about using strtod()?? (TODO) + /* I only implemented a simple float parser + * VZ: what about using strtod()?? (TODO) + */ + double f; - int sign; + int theSign; + + if (!m_input) + return 0; - if (!m_input) return 0; int c = NextNonSeparators(); if (c==(wxChar)0) return 0; @@ -156,22 +167,22 @@ double wxTextInputStream::ReadDouble() if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) ) { m_input.Ungetch(c); - return 0.0; + return 0; } if (c == wxT('-')) { - sign = -1; + theSign = -1; c = m_input.GetC(); } else if (c == wxT('+')) { - sign = 1; + theSign = 1; c = m_input.GetC(); } else { - sign = 1; + theSign = 1; } while (isdigit(c)) @@ -219,8 +230,7 @@ double wxTextInputStream::ReadDouble() m_input.Ungetch(c); } - f *= sign; - + f *= theSign; return f; } @@ -231,12 +241,24 @@ wxString wxTextInputStream::ReadString() wxString wxTextInputStream::ReadLine() { - wxChar c; wxString line; while ( !m_input.Eof() ) { - c = m_input.GetC(); +#if wxUSE_UNICODE + // FIXME: this is only works for single byte encodings + // How-to read a single char in an unkown encoding??? + char buf[10]; + buf[0] = m_input.GetC(); + buf[1] = 0; + + wxChar wbuf[2]; + m_conv.MB2WC( wbuf, buf, 2 ); + wxChar c = wbuf[0]; +#else + char c = m_input.GetC(); +#endif + if ( !m_input ) break; @@ -260,8 +282,15 @@ wxString wxTextInputStream::ReadWord() if ( !c ) return word; + word += c; + while ( !m_input.Eof() ) { + c = m_input.GetC(); + + if (!m_input) + break; + if (m_separators.Contains(c)) break; @@ -269,10 +298,6 @@ wxString wxTextInputStream::ReadWord() break; word += c; - - c = m_input.GetC(); - if (!m_input) - break; } return word; @@ -284,17 +309,19 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word) return *this; } -wxTextInputStream& wxTextInputStream::operator>>(wxChar& c) +wxTextInputStream& wxTextInputStream::operator>>(char& c) { if (!m_input) { - c = (wxChar) 0; + c = 0; return *this; } c = m_input.GetC(); - if (EatEOL(c)) c=wxT('\n'); + if (EatEOL(c)) + c = '\n'; + return *this; } @@ -334,15 +361,22 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) return *this; } + + +#if wxUSE_UNICODE +wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv) + : m_output(s), m_conv(conv) +#else wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) : m_output(s) +#endif { m_mode = mode; if (m_mode == wxEOL_NATIVE) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && !defined(__DARWIN__) m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; @@ -361,7 +395,7 @@ void wxTextOutputStream::SetMode(wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && !defined(__DARWIN__) m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; @@ -403,33 +437,46 @@ void wxTextOutputStream::WriteDouble(double d) void wxTextOutputStream::WriteString(const wxString& string) { - for (size_t i = 0; i < string.Len(); i++) + size_t len = string.length(); + + wxString out; + out.reserve(len); + + for ( size_t i = 0; i < len; i++ ) { - wxChar c = string[i]; - if (c == wxT('\n')) + const wxChar c = string[i]; + if ( c == wxT('\n') ) { - if (m_mode == wxEOL_DOS) - { - c = wxT('\r'); - m_output.Write( (const void*)(&c), sizeof(wxChar) ); - c = wxT('\n'); - m_output.Write( (const void*)(&c), sizeof(wxChar) ); - } else - if (m_mode == wxEOL_MAC) + switch ( m_mode ) { - c = wxT('\r'); - m_output.Write( (const void*)(&c), sizeof(wxChar) ); - } else - { - c = wxT('\n'); - m_output.Write( (const void*)(&c), sizeof(wxChar) ); + case wxEOL_DOS: + out << _T("\r\n"); + continue; + + case wxEOL_MAC: + out << _T('\r'); + continue; + + default: + wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") ); + // fall through + + case wxEOL_UNIX: + // don't treat '\n' specially + ; } } - else - { - m_output.Write( (const void*)(&c), sizeof(wxChar) ); - } + + 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 ) ); +#else + m_output.Write(out.c_str(), out.length() ); +#endif } wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string) @@ -444,9 +491,10 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) return *this; } -wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c) +wxTextOutputStream& wxTextOutputStream::operator<<(char c) { - WriteString( wxString(c) ); + WriteString( wxString::FromAscii(c) ); + return *this; }