AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-12-11 08:48:01 +00:00
parent 6da1ce6166
commit 6eaebb297a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/textctrl.h
View File

@ -439,7 +439,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
class WXDLLEXPORT wxStreamToTextRedirector class WXDLLEXPORT wxStreamToTextRedirector
{ {
private: private:
void Init() void Init(wxTextCtrl *text)
{ {
m_sbufOld = m_ostr.rdbuf(); m_sbufOld = m_ostr.rdbuf();
m_ostr.rdbuf(text); m_ostr.rdbuf(text);
@ -449,13 +449,13 @@ public:
wxStreamToTextRedirector(wxTextCtrl *text) wxStreamToTextRedirector(wxTextCtrl *text)
: m_ostr(wxSTD cout) : m_ostr(wxSTD cout)
{ {
Init(); Init(text);
} }
wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr) wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr)
: m_ostr(*ostr) : m_ostr(*ostr)
{ {
Init(); Init(text);
} }
~wxStreamToTextRedirector() ~wxStreamToTextRedirector()

2
src/common/string.cpp
View File

@ -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)) wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
{ {
#if 0 #if 0