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

blind wxOS2 build fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-04-18 08:08:56 +00:00
parent f096a6fdfc
commit a51fdf81b9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/string.cpp
View File

@@ -1691,7 +1691,7 @@ bool wxString::ToCLong(long *pVal, int base) const
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
WX_STRING_TO_X_TYPE_START WX_STRING_TO_X_TYPE_START
#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE #if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
long val = wxStrtol_lA(start, &end, base, wxCLocale); long val = wxStrtol_lA(start, &end, base, wxCLocale);
#else #else
long val = wxStrtol_l(start, &end, base, wxCLocale); long val = wxStrtol_l(start, &end, base, wxCLocale);
@@ -1704,7 +1704,7 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
WX_STRING_TO_X_TYPE_START WX_STRING_TO_X_TYPE_START
#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE #if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
unsigned long val = wxStrtoul_lA(start, &end, base, wxCLocale); unsigned long val = wxStrtoul_lA(start, &end, base, wxCLocale);
#else #else
unsigned long val = wxStrtoul_l(start, &end, base, wxCLocale); unsigned long val = wxStrtoul_l(start, &end, base, wxCLocale);
@@ -1715,7 +1715,7 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const
bool wxString::ToCDouble(double *pVal) const bool wxString::ToCDouble(double *pVal) const
{ {
WX_STRING_TO_X_TYPE_START WX_STRING_TO_X_TYPE_START
#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE #if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
double val = wxStrtod_lA(start, &end, wxCLocale); double val = wxStrtod_lA(start, &end, wxCLocale);
#else #else
double val = wxStrtod_l(start, &end, wxCLocale); double val = wxStrtod_l(start, &end, wxCLocale);