X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/784ee7d511ddec88c2a53c1b50c85850eb341dc6..ff2e9e2cc457f0d22b3dbaa85d06d07b8b3df5ab:/include/wx/msgout.h?ds=sidebyside

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 4f85b3581c..59fdc3df10 100644
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -51,6 +51,10 @@ public:
                                 (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
@@ -60,14 +64,12 @@ protected:
 #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__
     // "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
 
@@ -90,14 +92,13 @@ protected:
 #if wxUSE_UNICODE_UTF8
     virtual void DoPrintfUtf8(const char *format, ...);
 #endif
-    virtual void Output(const wxString& str) = 0;
 
 private:
     static wxMessageOutput* ms_msgOut;
 };
 
 #ifdef __VISUALC__
-    #pragma warning (default:4275)
+    #pragma warning (pop)
 #endif
 
 // ----------------------------------------------------------------------------
@@ -109,9 +110,9 @@ class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 public:
     wxMessageOutputStderr() { }
 
-protected:
     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);
@@ -134,7 +135,6 @@ public:
     wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR)
         : m_flags(flags) { }
 
-protected:
     virtual void Output(const wxString& str);
 
 private:
@@ -152,7 +152,6 @@ class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 public:
     wxMessageOutputMessageBox() { }
 
-protected:
     virtual void Output(const wxString& str);
 };
 
@@ -167,7 +166,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr
 public:
     wxMessageOutputDebug() { }
 
-protected:
     virtual void Output(const wxString& str);
 };
 
@@ -180,7 +178,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
 public:
     wxMessageOutputLog() { }
 
-protected:
     virtual void Output(const wxString& str);
 };