X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2523e9b70044baa92a1c63ffdfe179c28ad53536..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/msgout.h diff --git a/include/wx/msgout.h b/include/wx/msgout.h old mode 100755 new mode 100644 index f48232752a..b670f2b653 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -37,18 +37,29 @@ public: // show a message to the user // void Printf(const wxString& format, ...) = 0; - WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxString&), DoPrintf) + 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_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) + 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: // NB: this is pure virtual so that it can be implemented in dllexported // wxMessagOutput class - virtual void DoPrintf(const wxString& format, ...) = 0; +#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; @@ -73,7 +84,12 @@ public: static wxMessageOutput* Set(wxMessageOutput* msgout); protected: - virtual void DoPrintf(const wxString& format, ...); +#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: @@ -116,7 +132,7 @@ protected: // implementation which shows output in a message box // ---------------------------------------------------------------------------- -#if wxUSE_GUI +#if wxUSE_GUI && wxUSE_MSGDLG class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput { @@ -127,7 +143,7 @@ protected: virtual void Output(const wxString& str); }; -#endif // wxUSE_GUI +#endif // wxUSE_GUI && wxUSE_MSGDLG // ---------------------------------------------------------------------------- // implementation using the native way of outputting debug messages