Adapted to API changes with respect to GetTextExtent (patch #1709152).

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 636435746404c4ec1c320dd03d83a26be6c45375..f48232752a26c89a84594b49184e41d9e4faba4a 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -36,11 +36,21 @@ public:
     virtual ~wxMessageOutputBase() { }
 
     // show a message to the user
-    // void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
-    WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
+    // void Printf(const wxString& format, ...) = 0;
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxString&), DoPrintf)
+#ifdef __WATCOMC__
+    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const char*), DoPrintf)
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wchar_t*), DoPrintf)
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxCStrData&), DoPrintf)
+#endif
 
 protected:
-    void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    // NB: this is pure virtual so that it can be implemented in dllexported
+    //     wxMessagOutput class
+    virtual void DoPrintf(const wxString& format, ...) = 0;
+
+    // called by DoPrintf() to output formatted string
     virtual void Output(const wxString& str) = 0;
 };
 
@@ -62,6 +72,10 @@ public:
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
+protected:
+    virtual void DoPrintf(const wxString& format, ...);
+    virtual void Output(const wxString& str) = 0;
+
 private:
     static wxMessageOutput* ms_msgOut;
 };