X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54800df8d8f5e425c4f11538cd05341c51243543..82df67d960355e99a66b1db473b9d6236bf2fbb9:/include/wx/intl.h?ds=sidebyside diff --git a/include/wx/intl.h b/include/wx/intl.h index 8521815234..879f26be45 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -319,6 +319,38 @@ struct WXDLLEXPORT wxLanguageInfo wxString Description; // human-readable name of the language }; +// ---------------------------------------------------------------------------- +// wxLocaleCategory: the category of locale settings +// ---------------------------------------------------------------------------- + +enum wxLocaleCategory +{ + // (any) numbers + wxLOCALE_CAT_NUMBER, + + // date/time + wxLOCALE_CAT_DATE, + + // monetary value + wxLOCALE_CAT_MONEY, + + wxLOCALE_CAT_MAX +}; + +// ---------------------------------------------------------------------------- +// wxLocaleInfo: the items understood by wxLocale::GetInfo() +// ---------------------------------------------------------------------------- + +enum wxLocaleInfo +{ + // the thounsands separator + wxLOCALE_THOUSANDS_SEP, + + // the character used as decimal point + wxLOCALE_DECIMAL_POINT + +}; + // ---------------------------------------------------------------------------- // wxLocale: encapsulates all language dependent settings, including current // message catalogs, date, time and currency formats (TODO) &c @@ -378,6 +410,10 @@ public: // couldn't be determined static wxString GetSystemEncodingName(); + // get the values of the given locale-dependent datum: the current locale + // is used, the US default value is returned if everything else fails + static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat); + // return TRUE if the locale was set successfully bool IsOk() const { return m_pszOldLocale != NULL; } @@ -429,8 +465,8 @@ public: // // domains are searched in the last to first order, i.e. catalogs // added later override those added before. - const wxMB2WXbuf GetString(const wxChar *szOrigString, - const wxChar *szDomain = (const wxChar *) NULL) const; + const wxChar *GetString(const wxChar *szOrigString, + const wxChar *szDomain = (const wxChar *) NULL) const; // Returns the current short name for the locale const wxString& GetName() const { return m_strShort; } @@ -471,13 +507,13 @@ private: extern WXDLLEXPORT wxLocale* wxGetLocale(); // get the translation of the string in the current locale -inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz) +inline const wxChar *wxGetTranslation(const wxChar *sz) { wxLocale *pLoc = wxGetLocale(); if (pLoc) return pLoc->GetString(sz); else - return (const wxMB2WXbuf)sz; + return sz; } #else // !wxUSE_INTL @@ -492,7 +528,7 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz) // Note: use of 'inline' here can cause this symbol not to be found when compiled with gcc //const wxChar *wxGetTranslation(const wxChar *sz); -#define wxGetTranslation(sz) sz +#define wxGetTranslation(sz) (sz) #endif // wxUSE_INTL/!wxUSE_INTL