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

use locale-dependent decimal separator in our wxStrtod() implementation (recloses #8740)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-10 18:22:32 +00:00
parent cfa1d113a1
commit 4f9b965ff1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/wxchar.cpp
View File

@@ -2023,13 +2023,19 @@ WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
{ {
const wxChar decSep(
#if wxUSE_INTL
wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER)[0]
#else
_T('.')
#endif
);
const wxChar *start = nptr; const wxChar *start = nptr;
// FIXME: only correct for C locale
while (wxIsspace(*nptr)) nptr++; while (wxIsspace(*nptr)) nptr++;
if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
while (wxIsdigit(*nptr)) nptr++; while (wxIsdigit(*nptr)) nptr++;
if (*nptr == wxT('.')) { if (*nptr == decSep) {
nptr++; nptr++;
while (wxIsdigit(*nptr)) nptr++; while (wxIsdigit(*nptr)) nptr++;
} }
@@ -2040,7 +2046,7 @@ WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
} }
wxString data(start, nptr-start); wxString data(start, nptr-start);
wxWX2MBbuf dat = data.mb_str(wxConvLibc); const wxWX2MBbuf dat = data.mb_str(wxConvLibc);
char *rdat = wxMBSTRINGCAST dat; char *rdat = wxMBSTRINGCAST dat;
double ret = strtod(dat, &rdat); double ret = strtod(dat, &rdat);
@@ -2053,7 +2059,6 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
{ {
const wxChar *start = nptr; const wxChar *start = nptr;
// FIXME: only correct for C locale
while (wxIsspace(*nptr)) nptr++; while (wxIsspace(*nptr)) nptr++;
if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++; if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
if (((base == 0) || (base == 16)) && if (((base == 0) || (base == 16)) &&