X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28e0798fcdffb5233097060f7d43ffa01df7271d..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/xlocale.h?ds=sidebyside diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index bf8f8daf07..665fb6ecef 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -18,7 +18,7 @@ using decimal point &c. TODO: Currently only the character classification and transformation - functions and number <-> string functions, are implemented, + functions and number <-> string functions, are implemented, we also need at least - formatted IO: scanf_l(), printf_l() &c - time: strftime_l(), strptime_l() @@ -246,7 +246,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale; { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); } #if wxUSE_UNICODE - + // ctype functions #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l) #define wxCRT_Isalpha_lW wxXLOCALE_IDENT(iswalpha_l) @@ -302,8 +302,14 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale; { return wxCRT_Strtol_lW(c, endptr, base, loc.Get()); } inline unsigned long wxStrtoul_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc) { return wxCRT_Strtoul_lW(c, endptr, base, loc.Get()); } - - #endif // wxUSE_UNICDE (ctype functions) + #else // !wxUSE_UNICODE + inline double wxStrtod_l(const char *c, char **endptr, const wxXLocale& loc) + { return wxCRT_Strtod_lA(c, endptr, loc.Get()); } + inline long wxStrtol_l(const char *c, char **endptr, int base, const wxXLocale& loc) + { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); } + inline unsigned long wxStrtoul_l(const char *c, char **endptr, int base, const wxXLocale& loc) + { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); } + #endif // wxUSE_UNICODE #else // !wxHAS_XLOCALE_SUPPORT // ctype functions int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc); @@ -329,7 +335,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale; unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc); #endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT - + #endif // wxUSE_XLOCALE #endif // _WX_XLOCALE_H_