use wxFormatString in wxV[f]printf()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h
index a93872de9d4b26711bc09177d1badcc301f6302c..8b25fb62f6f5fa9c62e443d3e9dabd362320b712 100644 (file)
--- a/include/wx/wxcrtvararg.h
+++ b/include/wx/wxcrtvararg.h
@@ -284,13 +284,15 @@ WX_DEFINE_VARARG_FUNC(int, wxFprintf, 2, (FILE*, const wxFormatString&),
 inline int
 wxVprintf(const wxString& format, va_list ap)
 {
 inline int
 wxVprintf(const wxString& format, va_list ap)
 {

-    WX_VARARG_VFOO_IMPL((format, ap), wxCRT_Vprintf, vprintf);
+    WX_VARARG_VFOO_IMPL((wxFormatString(format), ap),
+                        wxCRT_Vprintf, vprintf);

 }
 
 inline int
 wxVfprintf(FILE *f, const wxString& format, va_list ap)
 {
 }
 
 inline int
 wxVfprintf(FILE *f, const wxString& format, va_list ap)
 {

-    WX_VARARG_VFOO_IMPL((f, format, ap), wxCRT_Vfprintf, vfprintf);
+    WX_VARARG_VFOO_IMPL((f, wxFormatString(format), ap),
+                        wxCRT_Vfprintf, vfprintf);

 }
 
 #undef WX_VARARG_VFOO_IMPL
 }
 
 #undef WX_VARARG_VFOO_IMPL