Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes after introduction of wxprintf.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 15:22:28 +00:00
parent 3c47c04740
commit bb809a9a80
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/wxprintf.cpp
View File

@@ -139,12 +139,12 @@ static int wxDoVsnprintf(CharType *buf, size_t lenMax,
} }
// finally, process each conversion specifier with its own argument // finally, process each conversion specifier with its own argument
toparse = format; const CharType *toparse = format;
for (i=0; i < parser.nargs; i++) for (i=0; i < parser.nargs; i++)
{ {
// copy in the output buffer the portion of the format string between // copy in the output buffer the portion of the format string between
// last specifier and the current one // 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, lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur,
tocopy, toparse); tocopy, toparse);
@@ -155,7 +155,8 @@ static int wxDoVsnprintf(CharType *buf, size_t lenMax,
} }
// process this specifier directly in the output buffer // 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) if (n == -1)
{ {
buf[lenMax-1] = wxT('\0'); // be sure to always NUL-terminate the string 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 // the +1 is because wxPrintfConvSpec::m_pArgEnd points to the last character
// of the format specifier, but we are not interested to it... // 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 // copy portion of the format string after last specifier