X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65a1bb98f584bdade18174bff3be96aad4466669..0bd2681966523df88ad5cf8e505b532843e58d74:/src/common/txtstrm.cpp?ds=inline diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 6f85a1d6cb..010fe739f6 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: @@ -9,10 +9,6 @@ // 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" @@ -22,6 +18,10 @@ #if wxUSE_STREAMS +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif + #include "wx/txtstrm.h" #include @@ -39,8 +39,10 @@ // ---------------------------------------------------------------------------- #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); } @@ -54,6 +56,9 @@ wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep) wxTextInputStream::~wxTextInputStream() { +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE } void wxTextInputStream::UngetLast() @@ -70,29 +75,35 @@ wxChar wxTextInputStream::NextChar() #if wxUSE_UNICODE wxChar wbuf[2]; memset((void*)m_lastBytes, 0, 10); - for(size_t inlen = 0; inlen < 9; inlen++) + 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) + 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.LastRead() <= 0) return wxEOT; - + return m_lastBytes[0]; #endif - + } wxChar wxTextInputStream::NextNonSeparators() @@ -112,18 +123,18 @@ wxChar wxTextInputStream::NextNonSeparators() 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 { wxChar c2 = NextChar(); - if(c2 == wxEOT) return TRUE; // end of stream reached, had enough :-) + if(c2 == wxEOT) return true; // end of stream reached, had enough :-) if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac - return TRUE; + return true; } - return FALSE; + return false; } wxUint32 wxTextInputStream::Read32(int base) @@ -132,7 +143,7 @@ wxUint32 wxTextInputStream::Read32(int base) if(!m_input) return 0; wxString word = ReadWord(); - if(word.IsEmpty()) + if(word.empty()) return 0; return wxStrtoul(word.c_str(), 0, base); } @@ -153,7 +164,7 @@ wxInt32 wxTextInputStream::Read32S(int base) if(!m_input) return 0; wxString word = ReadWord(); - if(word.IsEmpty()) + if(word.empty()) return 0; return wxStrtol(word.c_str(), 0, base); } @@ -172,16 +183,20 @@ double wxTextInputStream::ReadDouble() { 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; @@ -191,9 +206,6 @@ wxString wxTextInputStream::ReadLine() wxChar c = NextChar(); if(c == wxEOT) break; - - if ( !m_input ) - break; if (EatEOL(c)) break; @@ -216,13 +228,13 @@ wxString wxTextInputStream::ReadWord() return word; word += c; - + while ( !m_input.Eof() ) { c = NextChar(); if(c == wxEOT) break; - + if (m_separators.Contains(c)) break; @@ -252,6 +264,17 @@ wxTextInputStream& wxTextInputStream::operator>>(char& c) return *this; } +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE + +wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc) +{ + wc = GetChar(); + + return *this; +} + +#endif // wxUSE_UNICODE + wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i) { i = (wxInt16)Read16(); @@ -291,8 +314,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f) #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) @@ -313,6 +338,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode) wxTextOutputStream::~wxTextOutputStream() { +#if wxUSE_UNICODE + delete m_conv; +#endif // wxUSE_UNICODE } void wxTextOutputStream::SetMode(wxEOL mode) @@ -341,7 +369,7 @@ void wxTextOutputStream::Write32(wxUint32 i) void wxTextOutputStream::Write16(wxUint16 i) { wxString str; - str.Printf(wxT("%u"), i); + str.Printf(wxT("%u"), (unsigned)i); WriteString(str); } @@ -349,7 +377,7 @@ void wxTextOutputStream::Write16(wxUint16 i) void wxTextOutputStream::Write8(wxUint8 i) { wxString str; - str.Printf(wxT("%u"), i); + str.Printf(wxT("%u"), (unsigned)i); WriteString(str); } @@ -395,20 +423,24 @@ void wxTextOutputStream::WriteString(const wxString& string) } 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::operator<<(const wxChar *string) +wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) { - WriteString( wxString(string) ); +#if wxUSE_UNICODE + WriteString( wxString(&c, *m_conv, 1) ); +#else + WriteString( wxString(&c, wxConvLocal, 1) ); +#endif return *this; } @@ -421,20 +453,20 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) wxTextOutputStream& wxTextOutputStream::operator<<(char c) { WriteString( wxString::FromAscii(c) ); - + return *this; } -#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE +#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc) { - WriteString( wxString(&wc, m_conv, 1) ); + WriteString( wxString(&wc, *m_conv, 1) ); return *this; } -#endif // wxUSE_WCHAR_T +#endif // wxUSE_UNICODE wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c) { @@ -486,7 +518,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f) wxTextOutputStream &endl( wxTextOutputStream &stream ) { - return stream << wxT('\n'); + return stream.PutChar(wxT('\n')); } #endif