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

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

Browse Source 
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
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/wxchar.cpp
View File

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