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 b162bbb2b6164cb126d3466c131b89c59d937600..f48232752a26c89a84594b49184e41d9e4faba4a 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 #include "wx/strvararg.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/strvararg.h"
 
 // ----------------------------------------------------------------------------


@@ -36,11 +36,22 @@ public:
     virtual ~wxMessageOutputBase() { }
 
     // show a message to the user
     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:
 
 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 wxString& format, ...) = 0;
+
+    // called by DoPrintf() to output formatted string
+    virtual void Output(const wxString& str) = 0;

 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__


@@ -61,6 +72,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 wxString& format, ...);
+    virtual void Output(const wxString& str) = 0;
+

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


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

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

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


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

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

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


@@ -109,7 +124,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 +139,7 @@ public:
     wxMessageOutputDebug() { }
 
 protected:
     wxMessageOutputDebug() { }
 
 protected:

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

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


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

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

 };
 
 #endif
 };
 
 #endif