fixed vararg functions with format argument to not use wxString or reference argument (the latter is invalid C++, the former doesn't work with Watcom and produces at least warnings with GCC 3.3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -76,7 +76,8 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
|
||||
return old;
|
||||
}
|
||||
|
||||
void wxMessageOutput::DoPrintf(const wxString& format, ...)
|
||||
#if !wxUSE_UTF8_LOCALE_ONLY
|
||||
void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
@@ -87,6 +88,21 @@ void wxMessageOutput::DoPrintf(const wxString& format, ...)
|
||||
|
||||
Output(out);
|
||||
}
|
||||
#endif // !wxUSE_UTF8_LOCALE_ONLY
|
||||
|
||||
#if wxUSE_UNICODE_UTF8
|
||||
void wxMessageOutput::DoPrintfUtf8(const char *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
wxString out;
|
||||
|
||||
out.PrintfV(format, args);
|
||||
va_end(args);
|
||||
|
||||
Output(out);
|
||||
}
|
||||
#endif // wxUSE_UNICODE_UTF8
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMessageOutputBest
|
||||
|
Reference in New Issue
Block a user