Applied patch [ 817734 ] fix for cvs head with wxUSE_STD_IOSTREAM=1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 8efe4c913a6a99a536602ad82ca75d430042ebf2..fa7d7814fe27d805186a9c9a990566685cc9a951 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -439,7 +439,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
 class WXDLLEXPORT wxStreamToTextRedirector
 {
 private:
 class WXDLLEXPORT wxStreamToTextRedirector
 {
 private:

-    void Init()
+    void Init(wxTextCtrl *text)

     {
         m_sbufOld = m_ostr.rdbuf();
         m_ostr.rdbuf(text);
     {
         m_sbufOld = m_ostr.rdbuf();
         m_ostr.rdbuf(text);


@@ -449,13 +449,13 @@ public:
     wxStreamToTextRedirector(wxTextCtrl *text)
         : m_ostr(wxSTD cout)
     {
     wxStreamToTextRedirector(wxTextCtrl *text)
         : m_ostr(wxSTD cout)
     {

-        Init();
+        Init(text);

     }
 
     wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr)
         : m_ostr(*ostr)
     {
     }
 
     wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr)
         : m_ostr(*ostr)
     {

-        Init();
+        Init(text);

     }
 
     ~wxStreamToTextRedirector()
     }
 
     ~wxStreamToTextRedirector()

diff --git a/src/common/string.cpp b/src/common/string.cpp
index aa461904f498b58daab618ee883fb97f27159fc8..9a0cff0e00abae665a9c6ea6617490ec3d615cfa 100644 (file)
--- 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!
 
 //
 // ATTN: you can _not_ use both of these in the same program!
 

+#include <iostream>
+

 wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
 {
 #if 0
 wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
 {
 #if 0