diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 8efe4c913a..fa7d7814fe 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -439,7 +439,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&); class WXDLLEXPORT wxStreamToTextRedirector { private: - void Init() + void Init(wxTextCtrl *text) { m_sbufOld = m_ostr.rdbuf(); m_ostr.rdbuf(text); @@ -449,13 +449,13 @@ public: wxStreamToTextRedirector(wxTextCtrl *text) : m_ostr(wxSTD cout) { - Init(); + Init(text); } wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr) : m_ostr(*ostr) { - Init(); + Init(text); } ~wxStreamToTextRedirector() diff --git a/src/common/string.cpp b/src/common/string.cpp index aa461904f4..9a0cff0e00 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -100,6 +100,8 @@ extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy; // // ATTN: you can _not_ use both of these in the same program! +#include + wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str)) { #if 0