rename old wxAppConsole to wxAppConsoleBase and wxAppConsoleUnix to wxAppConsole...

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 5d080e91296e9a6bc6bb2d6c068a7d5076fd2550..34453a87c3d8df365c1c90b476c75375e5e7be3b 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1617,9 +1617,6 @@ static int DoStringPrintfV(wxString& str,
 
 int wxString::PrintfV(const wxString& format, va_list argptr)
 {
 
 int wxString::PrintfV(const wxString& format, va_list argptr)
 {

-    va_list argcopy;
-    wxVaCopy(argcopy, argptr);
-

 #if wxUSE_UNICODE_UTF8
     #if wxUSE_STL_BASED_WXSTRING
         typedef wxStringTypeBuffer<char> Utf8Buffer;
 #if wxUSE_UNICODE_UTF8
     #if wxUSE_STL_BASED_WXSTRING
         typedef wxStringTypeBuffer<char> Utf8Buffer;


@@ -1629,16 +1626,16 @@ int wxString::PrintfV(const wxString& format, va_list argptr)
 #endif
 
 #if wxUSE_UTF8_LOCALE_ONLY
 #endif
 
 #if wxUSE_UTF8_LOCALE_ONLY

-    return DoStringPrintfV<Utf8Buffer>(*this, format, argcopy);
+    return DoStringPrintfV<Utf8Buffer>(*this, format, argptr);

 #else
     #if wxUSE_UNICODE_UTF8
     if ( wxLocaleIsUtf8 )
 #else
     #if wxUSE_UNICODE_UTF8
     if ( wxLocaleIsUtf8 )

-        return DoStringPrintfV<Utf8Buffer>(*this, format, argcopy);
+        return DoStringPrintfV<Utf8Buffer>(*this, format, argptr);

     else
         // wxChar* version
     else
         // wxChar* version

-        return DoStringPrintfV<wxStringBuffer>(*this, format, argcopy);
+        return DoStringPrintfV<wxStringBuffer>(*this, format, argptr);

     #else
     #else

-        return DoStringPrintfV(*this, format, argcopy);
+        return DoStringPrintfV(*this, format, argptr);

     #endif // UTF8/WCHAR
 #endif
 }
     #endif // UTF8/WCHAR
 #endif
 }