start of alpha transparency support

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

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 7005b680bb92254616ba105ce577bc658a0ba61b..379ff977ba4775e8783d663402d222fd43c4f0a1 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "intl.h"
 #endif
 
@@ -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; }
 
@@ -414,6 +450,18 @@ public:
     // check if the given catalog is loaded
     bool IsLoaded(const wxChar *szDomain) const;
 
+    // Retrieve the language info struct for the given language
+    //
+    // Returns NULL if no info found, pointer must *not* be deleted by caller
+    static const wxLanguageInfo *GetLanguageInfo(int lang);
+
+    // Find the language for the given locale string which may be either a
+    // canonical ISO 2 letter language code ("xx"), a language code followed by
+    // the country code ("xx_XX") or a Windows full language name ("Xxxxx...")
+    //
+    // Returns NULL if no info found, pointer must *not* be deleted by caller
+    static const wxLanguageInfo *FindLanguageInfo(const wxString& locale);
+
     // Add custom language to the list of known languages.
     // Notes: 1) wxLanguageInfo contains platform-specific data
     //        2) must be called before Init to have effect
@@ -429,8 +477,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; }
@@ -461,6 +509,8 @@ private:
     bool           m_bConvertEncoding;
 
     static wxLanguageInfoArray *ms_languagesDB;
+
+    DECLARE_NO_COPY_CLASS(wxLocale)
 };
 
 // ----------------------------------------------------------------------------
@@ -471,13 +521,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