X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a9464893a755abfaa17ec72da7b2e65045eff43..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msgout.h diff --git a/include/wx/msgout.h b/include/wx/msgout.h index 7156134f79..225df86b3c 100644 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -69,6 +69,7 @@ protected: #ifdef __VISUALC__ // "non dll-interface class 'wxStringPrintfMixin' used as base interface // for dll-interface class 'wxString'" -- this is OK in our case + #pragma warning (push) #pragma warning (disable:4275) #endif @@ -97,17 +98,17 @@ private: }; #ifdef __VISUALC__ - #pragma warning (default:4275) + #pragma warning (pop) #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); @@ -115,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; }; // ----------------------------------------------------------------------------