X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/067fd8b47ea5e063723eb55820cd2c320fe9f60b..6f0b6fd1e4b5b2633e1f34c54c8d4f4e5da98637:/src/common/xlocale.cpp diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp index 24d1a3f443..b1c08bade9 100644 --- a/src/common/xlocale.cpp +++ b/src/common/xlocale.cpp @@ -31,6 +31,9 @@ #include "wx/xlocale.h" +#include +#include + // ---------------------------------------------------------------------------- // module globals // ---------------------------------------------------------------------------- @@ -38,6 +41,9 @@ // This is the C locale object, it is created on demand static wxXLocale *gs_cLocale = NULL; +wxXLocale wxNullXLocale; + + // ============================================================================ // implementation // ============================================================================ @@ -71,7 +77,9 @@ wxXLocale& wxXLocale::GetCLocale() { if ( !gs_cLocale ) { - gs_cLocale = new wxXLocale(wx_static_cast(wxXLocaleCTag *, NULL)); + // NOTE: bcc551 has trouble doing static_cast with incomplete + // type definition. reinterpret_cast used as workaround + gs_cLocale = new wxXLocale( reinterpret_cast(NULL) ); } return *gs_cLocale; @@ -88,14 +96,7 @@ wxXLocale::wxXLocale(wxLanguage lang) } else { - wxString loc; -#ifdef __WXMSW__ - loc = info->Description; -#else - loc = info->CanonicalName; -#endif - - Init(loc.c_str()); + Init(info->GetLocaleName().c_str()); } } @@ -107,6 +108,9 @@ wxXLocale::wxXLocale(wxLanguage lang) void wxXLocale::Init(const char *loc) { + if (!loc || *loc == '\0') + return; + m_locale = _create_locale(LC_ALL, loc); } @@ -124,7 +128,38 @@ void wxXLocale::Free() void wxXLocale::Init(const char *loc) { + if (!loc || *loc == '\0') + return; + m_locale = newlocale(LC_ALL_MASK, loc, NULL); + if (!m_locale) + { + // NOTE: here we do something similar to what wxSetLocaleTryUTF8() does + // in wxLocale code (but with newlocale() calls instead of wxSetlocale()) + wxString buf(loc); + wxString buf2; + buf2 = buf + wxS(".UTF-8"); + m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); + if ( !m_locale ) + { + buf2 = buf + wxS(".utf-8"); + m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); + } + if ( !m_locale ) + { + buf2 = buf + wxS(".UTF8"); + m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); + } + if ( !m_locale ) + { + buf2 = buf + wxS(".utf8"); + m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL); + } + } + + // TODO: wxLocale performs many more manipulations of the given locale + // string in the attempt to set a valid locale; reusing that code + // (changing it to take a generic wxTryLocale callback) would be nice } void wxXLocale::Free() @@ -162,7 +197,7 @@ void wxXLocale::Free() #define CTYPE_UPPER 0x0200 #define CTYPE_XDIGIT 0x0400 -static unsigned int gs_lookup[] = +static const unsigned int gs_lookup[] = { 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0004, 0x0004, @@ -230,6 +265,85 @@ int wxToupper_l(const wxUniChar& c, const wxXLocale& loc) return c; } + +// ---------------------------------------------------------------------------- +// string --> number conversion functions +// ---------------------------------------------------------------------------- + +/* + WARNING: the implementation of the wxStrtoX_l() functions below is unsafe + in a multi-threaded environment as we temporary change the locale + and if in the meanwhile an other thread performs some locale-dependent + operation, it may get unexpected results... + However this is the best we can do without reinventing the wheel in the + case !wxHAS_XLOCALE_SUPPORT... +*/ + +/* + Note that this code is similar to (a portion of) wxLocale::IsAvailable code +*/ +#define IMPLEMENT_STRTOX_L_START \ + wxCHECK(loc.IsOk(), 0); \ + \ + /* (Try to) temporary set the 'C' locale */ \ + const char *oldLocale = wxSetlocale(LC_NUMERIC, "C"); \ + if ( !oldLocale ) \ + { \ + /* the current locale was not changed; no need to */ \ + /* restore the previous one... */ \ + errno = EINVAL; \ + /* signal an error (better than nothing) */ \ + return 0; \ + } + +#define IMPLEMENT_STRTOX_L_END \ + /* restore the original locale */ \ + wxSetlocale(LC_NUMERIC, oldLocale); \ + return ret; + +double wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + double ret = wxStrtod(str, endptr); + IMPLEMENT_STRTOX_L_END +} + +double wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + double ret = wxStrtod(str, endptr); + IMPLEMENT_STRTOX_L_END +} + +long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + long ret = wxStrtol(str, endptr, base); + IMPLEMENT_STRTOX_L_END +} + +long wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + long ret = wxStrtol(str, endptr, base); + IMPLEMENT_STRTOX_L_END +} + +unsigned long wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + unsigned long ret = wxStrtoul(str, endptr, base); + IMPLEMENT_STRTOX_L_END +} + +unsigned long wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc) +{ + IMPLEMENT_STRTOX_L_START + unsigned long ret = wxStrtoul(str, endptr, base); + IMPLEMENT_STRTOX_L_END +} + + #endif // !defined(wxHAS_XLOCALE_SUPPORT) #endif // wxUSE_XLOCALE