make wxMessageOutput::Output() public to avoid having to call Printf("%s", s)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 4f85b3581c8fdf04f98ebe633bbee101b65f5e1e..7156134f79e31f2ac70aa19a1033c1c44c241b68 100644 (file)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -51,6 +51,10 @@ public:
                                 (wxFormatString(f1)));
 #endif
 
                                 (wxFormatString(f1)));
 #endif
 

+    // called by DoPrintf() to output formatted string but can also be called
+    // directly if no formatting is needed
+    virtual void Output(const wxString& str) = 0;
+

 protected:
     // NB: this is pure virtual so that it can be implemented in dllexported
     //     wxMessagOutput class
 protected:
     // NB: this is pure virtual so that it can be implemented in dllexported
     //     wxMessagOutput class


@@ -60,9 +64,6 @@ protected:
 #if wxUSE_UNICODE_UTF8
     virtual void DoPrintfUtf8(const char *format, ...) = 0;
 #endif
 #if wxUSE_UNICODE_UTF8
     virtual void DoPrintfUtf8(const char *format, ...) = 0;
 #endif

-
-    // called by DoPrintf() to output formatted string
-    virtual void Output(const wxString& str) = 0;

 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__


@@ -90,7 +91,6 @@ protected:
 #if wxUSE_UNICODE_UTF8
     virtual void DoPrintfUtf8(const char *format, ...);
 #endif
 #if wxUSE_UNICODE_UTF8
     virtual void DoPrintfUtf8(const char *format, ...);
 #endif

-    virtual void Output(const wxString& str) = 0;

 
 private:
     static wxMessageOutput* ms_msgOut;
 
 private:
     static wxMessageOutput* ms_msgOut;


@@ -109,9 +109,9 @@ class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 public:
     wxMessageOutputStderr() { }
 
 public:
     wxMessageOutputStderr() { }
 

-protected:

     virtual void Output(const wxString& str);
 
     virtual void Output(const wxString& str);
 

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


@@ -134,7 +134,6 @@ public:
     wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR)
         : m_flags(flags) { }
 
     wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR)
         : m_flags(flags) { }
 

-protected:

     virtual void Output(const wxString& str);
 
 private:
     virtual void Output(const wxString& str);
 
 private:


@@ -152,7 +151,6 @@ class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 public:
     wxMessageOutputMessageBox() { }
 
 public:
     wxMessageOutputMessageBox() { }
 

-protected:

     virtual void Output(const wxString& str);
 };
 
     virtual void Output(const wxString& str);
 };
 


@@ -167,7 +165,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr
 public:
     wxMessageOutputDebug() { }
 
 public:
     wxMessageOutputDebug() { }
 

-protected:

     virtual void Output(const wxString& str);
 };
 
     virtual void Output(const wxString& str);
 };
 


@@ -180,7 +177,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
 public:
     wxMessageOutputLog() { }
 
 public:
     wxMessageOutputLog() { }
 

-protected:

     virtual void Output(const wxString& str);
 };
 
     virtual void Output(const wxString& str);
 };