From e8c9268b3aa0596f495d5269e4f7cf28a70d1ed7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 18 Jul 2009 23:22:51 +0000 Subject: [PATCH] Add option FILE* parameter to wxMessageOutputStderr ctor, just as with wxLogStderr. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msgout.h | 6 ++++-- src/common/msgout.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/msgout.h b/include/wx/msgout.h index 59fdc3df10..225df86b3c 100644 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -102,13 +102,13 @@ private: #endif // ---------------------------------------------------------------------------- -// implementation which sends output to stderr +// implementation which sends output to stderr or specified file // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput { public: - wxMessageOutputStderr() { } + wxMessageOutputStderr(FILE *fp = stderr) : m_fp(fp) { } virtual void Output(const wxString& str); @@ -116,6 +116,8 @@ protected: // return the string with "\n" appended if it doesn't already terminate // with it (in which case it's returned unchanged) wxString AppendLineFeedIfNeeded(const wxString& str); + + FILE *m_fp; }; // ---------------------------------------------------------------------------- diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 0e663c40fc..07889dbc59 100644 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -144,9 +144,9 @@ void wxMessageOutputStderr::Output(const wxString& str) const wxWX2MBbuf buf = strWithLF.mb_str(); if ( buf ) - fprintf(stderr, "%s", (const char*) buf); + fprintf(m_fp, "%s", (const char*) buf); else // print at least something - fprintf(stderr, "%s", (const char*) strWithLF.ToAscii()); + fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii()); } // ---------------------------------------------------------------------------- -- 2.45.2