X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3793402c74565f00a70ce853f8e22d71c051f919..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/txtstrm.cpp diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 299a97cf29..f7d6c09efd 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: txtstrm.cpp +// Name: src/common/txtstrm.cpp // Purpose: Text stream classes // Author: Guilhem Lavaux // Modified by: @@ -19,16 +19,12 @@ #if wxUSE_STREAMS #include "wx/txtstrm.h" -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif -// Unix: "\n" -// Dos: "\r\n" -// Mac: "\r" +#include // ---------------------------------------------------------------------------- // wxTextInputStream @@ -105,7 +101,7 @@ wxChar wxTextInputStream::NextNonSeparators() if (c != wxT('\n') && c != wxT('\r') && - !m_separators.Contains(c)) + m_separators.Find(c) < 0) return c; } @@ -178,11 +174,15 @@ double wxTextInputStream::ReadDouble() 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; @@ -193,9 +193,6 @@ wxString wxTextInputStream::ReadLine() if(c == wxEOT) break; - if ( !m_input ) - break; - if (EatEOL(c)) break; @@ -224,7 +221,7 @@ wxString wxTextInputStream::ReadWord() if(c == wxEOT) break; - if (m_separators.Contains(c)) + if (m_separators.Find(c) >= 0) break; if (EatEOL(c)) @@ -317,8 +314,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif @@ -339,8 +334,6 @@ void wxTextOutputStream::SetMode(wxEOL mode) { #if defined(__WXMSW__) || defined(__WXPM__) m_mode = wxEOL_DOS; -#elif defined(__WXMAC__) && !defined(__DARWIN__) - m_mode = wxEOL_MAC; #else m_mode = wxEOL_UNIX; #endif @@ -415,9 +408,9 @@ void wxTextOutputStream::WriteString(const wxString& string) } #if wxUSE_UNICODE - // note that we must not write the trailing NUL here - wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len); - m_output.Write(buffer, len + 1 - m_conv->GetMBNulLen()); + // 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 @@ -433,10 +426,17 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) 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)