X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2a139adfdd96a0f781cbc013daff122aa23bba2..5c2e93769956ec4a3ff1c6f02f8c2b492a13febd:/include/wx/intl.h

diff --git a/include/wx/intl.h b/include/wx/intl.h
index d1f9408f4f..7d92024a86 100644
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -6,13 +6,13 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "intl.h"
 #endif
 
@@ -347,7 +347,7 @@ enum wxLocaleInfo
     wxLOCALE_THOUSANDS_SEP,
 
     // the character used as decimal point
-    wxLOCALE_DECIMAL_POINT,
+    wxLOCALE_DECIMAL_POINT
 
 };
 
@@ -450,6 +450,22 @@ 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);
+
+    // Returns language name in English or empty string if the language
+    // is not in database
+    static wxString GetLanguageName(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
@@ -465,8 +481,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; }
@@ -497,6 +513,8 @@ private:
     bool           m_bConvertEncoding;
 
     static wxLanguageInfoArray *ms_languagesDB;
+
+    DECLARE_NO_COPY_CLASS(wxLocale)
 };
 
 // ----------------------------------------------------------------------------
@@ -507,13 +525,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
@@ -521,7 +539,7 @@ inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
 // the macros should still be defined - otherwise compilation would fail
 
 #if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(_)
-    #define   _(str)  (str)
+    #define   _(str)  (_T(str))
 #endif
 
 #define wxTRANSLATE(str) _T(str)