X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfaee57e812ccfb264170dd9a03f0bb186c1773b..e319bb30f7e88242f56144fcc279b57047566a6b:/src/common/txtstrm.cpp?ds=sidebyside diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 20b583604c..d2e08f5c8f 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: @@ -178,11 +178,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 +197,6 @@ wxString wxTextInputStream::ReadLine() if(c == wxEOT) break; - if ( !m_input ) - break; - if (EatEOL(c)) break;