From bb809a9a80e31a33a9e00598897acdaf2b874972 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 22 Aug 2007 15:22:28 +0000 Subject: [PATCH] compilation fixes after introduction of wxprintf.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wxprintf.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/wxprintf.cpp b/src/common/wxprintf.cpp index 9e46924085..fada74e496 100644 --- a/src/common/wxprintf.cpp +++ b/src/common/wxprintf.cpp @@ -139,12 +139,12 @@ static int wxDoVsnprintf(CharType *buf, size_t lenMax, } // finally, process each conversion specifier with its own argument - toparse = format; + const CharType *toparse = format; for (i=0; i < parser.nargs; i++) { // copy in the output buffer the portion of the format string between // last specifier and the current one - size_t tocopy = ( arg[i].m_pArgPos - toparse ); + size_t tocopy = ( parser.arg[i].m_pArgPos - toparse ); lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur, tocopy, toparse); @@ -155,7 +155,8 @@ static int wxDoVsnprintf(CharType *buf, size_t lenMax, } // process this specifier directly in the output buffer - int n = arg[i].Process(buf+lenCur, lenMax - lenCur, &argdata[arg[i].m_pos], lenCur); + int n = parser.arg[i].Process(buf+lenCur, lenMax - lenCur, + &argdata[parser.arg[i].m_pos], lenCur); if (n == -1) { buf[lenMax-1] = wxT('\0'); // be sure to always NUL-terminate the string @@ -165,7 +166,7 @@ static int wxDoVsnprintf(CharType *buf, size_t lenMax, // the +1 is because wxPrintfConvSpec::m_pArgEnd points to the last character // of the format specifier, but we are not interested to it... - toparse = arg[i].m_pArgEnd + 1; + toparse = parser.arg[i].m_pArgEnd + 1; } // copy portion of the format string after last specifier -- 2.45.2