X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210f4bcd661c968e7cd068ab9b551623d92a3dac..e3b71cb8839390d529b43147c2fdb8fcca94f851:/src/common/wxchar.cpp diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index d1e12530da..368d4bf9fb 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -5,7 +5,7 @@ // Modified by: Ron Lee // Created: 09/04/99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows copyright +// Copyright: (c) wxWidgets copyright // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -704,7 +704,7 @@ int vwprintf(const wxChar *format, va_list argptr) So to use native functions in order to get our semantics we must do the following translations in Unicode mode (nothing to do in ANSI mode): - wxWindows specifier POSIX specifier + wxWidgets specifier POSIX specifier ---------------------------------------- %hc, %C, %hC %c @@ -774,10 +774,10 @@ private: ch == _T('0') || ch == _T(' ') || ch == _T('#'); } - void SkipDigits(const wxChar **ppc) + void SkipDigits(const wxChar **ptpc) { - while ( **ppc >= _T('0') && **ppc <= _T('9') ) - CopyFmtChar(*(*ppc)++); + while ( **ptpc >= _T('0') && **ptpc <= _T('9') ) + CopyFmtChar(*(*ptpc)++); } // the translated format @@ -962,9 +962,9 @@ int wxSprintf( wxChar *str, const wxChar *format, ... ) va_list argptr; va_start(argptr, format); - // note that wxString::Format() uses wxVsnprintf(), not wxSprintf(), so + // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so // it's safe to implement this one in terms of it - wxString s(wxString::Format(format, argptr)); + wxString s(wxString::FormatV(format, argptr)); wxStrcpy(str, s); va_end(argptr);