X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9f7896861f734ce044ee8601ba2d8a6959c9d9e..a0826b119e63f4cfbf8361cbaf7cedef56e0ec53:/include/wx/msgout.h diff --git a/include/wx/msgout.h b/include/wx/msgout.h index b162bbb2b6..56b11a6244 100755 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- #include "wx/defs.h" -#include "wx/wxchar.h" +#include "wx/chartype.h" #include "wx/strvararg.h" // ---------------------------------------------------------------------------- @@ -36,11 +36,33 @@ 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 wxFormatString&), + DoPrintfWchar, DoPrintfUtf8) +#ifdef __WATCOMC__ + // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351 + WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxString&), + (wxFormatString(f1))); + WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxCStrData&), + (wxFormatString(f1))); + WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const char*), + (wxFormatString(f1))); + WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wchar_t*), + (wxFormatString(f1))); +#endif 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 +#if !wxUSE_UTF8_LOCALE_ONLY + virtual void DoPrintfWchar(const wxChar *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__ @@ -61,6 +83,15 @@ public: // sets the global wxMessageOutput instance; returns the previous one static wxMessageOutput* Set(wxMessageOutput* msgout); +protected: +#if !wxUSE_UTF8_LOCALE_ONLY + virtual void DoPrintfWchar(const wxChar *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; }; @@ -81,7 +112,7 @@ public: wxMessageOutputBest() { } protected: - virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; + virtual void Output(const wxString& str); }; // ---------------------------------------------------------------------------- @@ -94,7 +125,7 @@ public: wxMessageOutputStderr() { } protected: - virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; + virtual void Output(const wxString& str); }; // ---------------------------------------------------------------------------- @@ -109,7 +140,7 @@ public: wxMessageOutputMessageBox() { } protected: - virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; + virtual void Output(const wxString& str); }; #endif // wxUSE_GUI @@ -124,7 +155,7 @@ public: wxMessageOutputDebug() { } protected: - virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; + virtual void Output(const wxString& str); }; // ---------------------------------------------------------------------------- @@ -137,7 +168,7 @@ public: wxMessageOutputLog() { } protected: - virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; + virtual void Output(const wxString& str); }; #endif