X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8650108199bf799f21e29811cddaefd579c98c88..faeaa9db1cd8b68b36e659839635e61f89e647c7:/src/common/txtstrm.cpp diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp index 524402d54f..4792c10cce 100644 --- a/src/common/txtstrm.cpp +++ b/src/common/txtstrm.cpp @@ -18,6 +18,10 @@ #if wxUSE_STREAMS +#ifndef WX_PRECOMP + #include "wx/crt.h" +#endif + #include "wx/txtstrm.h" #include @@ -318,8 +322,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 @@ -340,8 +342,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 @@ -434,12 +434,6 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c) return *this; } -wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string) -{ - WriteString( wxString(string) ); - return *this; -} - wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string) { WriteString( string );