compilation fix -- a better way

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 85218152344c755a6fe4bf0bb6d8222ec5e7eadb..98c4771f7159a4c1ea9b8a6af68af5c719fd7123 100644 (file)
--- 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
 };
 
     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
 // ----------------------------------------------------------------------------
 // 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();
 
     // 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; }
 
     // return TRUE if the locale was set successfully
     bool IsOk() const { return m_pszOldLocale != NULL; }
 


@@ -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);
 
 // 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
 
 
 #endif // wxUSE_INTL/!wxUSE_INTL