X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1f6e2cfe2edae646d58e94c6a6b5f010f6439f7..40e5ebbf98728d627e4d3c9e3a57f28f5bb8fcb9:/include/wx/msgout.h?ds=sidebyside diff --git a/include/wx/msgout.h b/include/wx/msgout.h index 24b7450091..56b11a6244 100755 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -37,16 +37,18 @@ public: // show a message to the user // void Printf(const wxString& format, ...) = 0; - WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxString&), + 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*), - DoPrintfWchar, DoPrintfUtf8) - WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wchar_t*), - DoPrintfWchar, DoPrintfUtf8) - WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxCStrData&), - DoPrintfWchar, DoPrintfUtf8) + 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: