Correct wxImage::Size() again; add unit tests for it.

[wxWidgets.git] / include / wx / msgout.h

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 59fdc3df1000c9a4142083c7a98f396740d85645..225df86b3c7e9038bd8da2008996b73a47c5251b 100644 (file)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -102,13 +102,13 @@ private:
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// implementation which sends output to stderr
+// implementation which sends output to stderr or specified file

 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 {
 public:
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 {
 public:

-    wxMessageOutputStderr() { }
+    wxMessageOutputStderr(FILE *fp = stderr) : m_fp(fp) { }

 
     virtual void Output(const wxString& str);
 
 
     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);
     // 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;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------