No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 7156134f79e31f2ac70aa19a1033c1c44c241b68..225df86b3c7e9038bd8da2008996b73a47c5251b 100644 (file)
--- 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
 #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
 
     #pragma warning (disable:4275)
 #endif
 


@@ -97,17 +98,17 @@ private:
 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #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);
 


@@ -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);
     // 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;

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