added implicit conversion of wxString to const void * for compatibility with the...

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 0445407d28dd9780d441be8369f4f5a3c7564dda..ba377c079cb98fccf0c49f79221b9ae22d0b4878 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -40,7 +40,12 @@ public:
     WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
 
 protected:
     WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
+    // NB: this is pure virtual so that it can be implemented in dllexported
+    //     wxMessagOutput class
+    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2 = 0;
+
+    // called by DoPrintf() to output formatted string
+    virtual void Output(const wxString& str) = 0;

 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__


@@ -61,6 +66,10 @@ public:
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 

+protected:
+    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str) = 0;
+

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


@@ -81,7 +90,7 @@ public:
     wxMessageOutputBest() { }
 
 protected:
     wxMessageOutputBest() { }
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str);

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


@@ -94,7 +103,7 @@ public:
     wxMessageOutputStderr() { }
 
 protected:
     wxMessageOutputStderr() { }
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str);

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


@@ -109,7 +118,7 @@ public:
     wxMessageOutputMessageBox() { }
 
 protected:
     wxMessageOutputMessageBox() { }
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str);

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI


@@ -124,7 +133,7 @@ public:
     wxMessageOutputDebug() { }
 
 protected:
     wxMessageOutputDebug() { }
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str);

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


@@ -137,7 +146,7 @@ public:
     wxMessageOutputLog() { }
 
 protected:
     wxMessageOutputLog() { }
 
 protected:

-    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str);

 };
 
 #endif
 };
 
 #endif