Fix wxSnvprintf (and hence wxString::Format) for Unicode, when using

the wxSnvprintf in wxchar.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon 2002-09-08 22:52:59 +00:00
parent 197b162641
commit b1a046e821

View File

@ -302,8 +302,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
size_t val = va_arg(argptr, size_t);
::sprintf(szScratch, s_szFlags, val);
}
APPEND_STR(wxConvLibc.cMB2WX(szScratch));
{
wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
APPEND_STR(tmp);
}
done = TRUE;
break;
@ -323,8 +325,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
double val = va_arg(argptr, double);
::sprintf(szScratch, s_szFlags, val);
}
APPEND_STR(wxConvLibc.cMB2WX(szScratch));
{
wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
APPEND_STR(tmp);
}
done = TRUE;
break;
@ -337,7 +341,8 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
s_szFlags[flagofs] = '\0';
::sprintf(szScratch, s_szFlags, val);
APPEND_STR(wxConvLibc.cMB2WX(szScratch));
wxMB2WXbuf tmp = wxConvLibc.cMB2WX(szScratch);
APPEND_STR(tmp);
done = TRUE;
}