Add RunScript and implement on all backends. Document and add a very simple unit...

[wxWidgets.git] / include / wx / xlocale.h

diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index d2ca8d2008e2631e0b787958ec0428263a32f1f1..665fb6ecefaea4874a178b841716bdce3079597a 100644 (file)
--- 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);
@@ -319,6 +325,15 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale;
     int WXDLLIMPEXP_BASE wxIsxdigit_l(const wxUniChar& c, const wxXLocale& loc);
     int WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc);
     int WXDLLIMPEXP_BASE wxToupper_l(const wxUniChar& c, const wxXLocale& loc);
+
+    // stdlib functions
+    double WXDLLIMPEXP_BASE wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc);
+    double WXDLLIMPEXP_BASE wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc);
+    long WXDLLIMPEXP_BASE wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc);
+    long WXDLLIMPEXP_BASE wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc);
+    unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc);
+    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