X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6686fbad16ec929f33cbbcc1b638bf00406218c5..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/numformatter.h diff --git a/include/wx/numformatter.h b/include/wx/numformatter.h index 02bae6d531..13b47b210b 100644 --- a/include/wx/numformatter.h +++ b/include/wx/numformatter.h @@ -30,7 +30,10 @@ public: // precision can also be specified. static wxString ToString(long val, int style = Style_WithThousandsSep); - +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + static wxString ToString(wxLongLong_t val, + int style = Style_WithThousandsSep); +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG static wxString ToString(double val, int precision, int style = Style_WithThousandsSep); @@ -40,6 +43,9 @@ public: // Return true on success and stores the result in the provided location // which must be a valid non-NULL pointer. static bool FromString(wxString s, long *val); +#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG + static bool FromString(wxString s, wxLongLong_t *val); +#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG static bool FromString(wxString s, double *val); @@ -53,6 +59,9 @@ public: static bool GetThousandsSeparatorIfUsed(wxChar *sep); private: + // Post-process the string representing an integer. + static wxString PostProcessIntString(wxString s, int style); + // Add the thousands separators to a string representing a number without // the separators. This is used by ToString(Style_WithThousandsSep). static void AddThousandsSeparators(wxString& s);