cleanup mac

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 4915e52efe3c8de0ccab96e3663aa47033f03aac..7c8323ab1859ae5d70ef5eb39bc52e411ffd19c6 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -18,10 +18,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__BORLAND__) && !defined(__WXDEBUG__)
-    // There's a bug in Borland's compiler that breaks wxLocale with -O2,
-    // so make sure that flag is not used for this file:
-    #pragma option -O1
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #ifdef __EMX__
 #endif
 
 #ifdef __EMX__


@@ -30,13 +31,6 @@
 #define __INTERNAL_DEFS
 #endif
 
 #define __INTERNAL_DEFS
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-

 #if wxUSE_INTL
 
 #ifndef WX_PRECOMP
 #if wxUSE_INTL
 
 #ifndef WX_PRECOMP


@@ -75,9 +69,17 @@
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"

+#include "wx/hashset.h"
+#include "wx/filesys.h"

 
 #if defined(__WXMAC__)
 
 #if defined(__WXMAC__)

-    #include  "wx/mac/private.h"  // includes mac headers
+    #include "wx/mac/private.h"  // includes mac headers
+#endif
+
+#if defined(__DARWIN__)
+       #include "wx/mac/corefoundation/cfref.h"
+       #include <CoreFoundation/CFLocale.h>
+       #include "wx/mac/corefoundation/cfstring.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -878,7 +880,7 @@ public:
    ~wxMsgCatalogFile();
 
     // load the catalog from disk (szDirPrefix corresponds to language)
    ~wxMsgCatalogFile();
 
     // load the catalog from disk (szDirPrefix corresponds to language)

-    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
+    bool Load(const wxString& szDirPrefix, const wxString& szName,

               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs
               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs


@@ -912,11 +914,8 @@ private:
                 ofsHashTable;   //        +18:  offset of hash table start
     };
 
                 ofsHashTable;   //        +18:  offset of hash table start
     };
 

-    // all data is stored here, NULL if no data loaded
-    size_t8 *m_pData;
-
-    // amount of memory pointed to by m_pData.
-    size_t32 m_nSize;
+    // all data is stored here
+    wxMemoryBuffer m_data;

 
     // data description
     size_t32          m_numStrings;   // number of strings in this domain
 
     // data description
     size_t32          m_numStrings;   // number of strings in this domain


@@ -934,18 +933,25 @@ private:
                             : ui;
     }
 
                             : ui;
     }
 

+    // just return the pointer to the start of the data as "char *" to
+    // facilitate doing pointer arithmetic with it
+    char *StringData() const
+    {
+        return wx_static_cast(char *, m_data.GetData());
+    }
+

     const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
     {
         const wxMsgTableEntry * const ent = pTable + n;
 
         // this check could fail for a corrupt message catalog
         size_t32 ofsString = Swap(ent->ofsString);
     const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
     {
         const wxMsgTableEntry * const ent = pTable + n;
 
         // this check could fail for a corrupt message catalog
         size_t32 ofsString = Swap(ent->ofsString);

-        if ( ofsString + Swap(ent->nLen) > m_nSize)
+        if ( ofsString + Swap(ent->nLen) > m_data.GetDataLen())

         {
             return NULL;
         }
 
         {
             return NULL;
         }
 

-        return (const char *)(m_pData + ofsString);
+        return StringData() + ofsString;

     }
 
     bool m_bSwapped;   // wrong endianness?
     }
 
     bool m_bSwapped;   // wrong endianness?


@@ -968,14 +974,14 @@ public:
     ~wxMsgCatalog();
 
     // load the catalog from disk (szDirPrefix corresponds to language)
     ~wxMsgCatalog();
 
     // load the catalog from disk (szDirPrefix corresponds to language)

-    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
-              const wxChar *msgIdCharset = NULL, bool bConvertEncoding = false);
+    bool Load(const wxString& dirPrefix, const wxString& name,
+              const wxString& msgIdCharset, bool bConvertEncoding = false);

 
     // get name of the catalog
     wxString GetName() const { return m_name; }
 
     // get the translated string: returns NULL if not found
 
     // get name of the catalog
     wxString GetName() const { return m_name; }
 
     // get the translated string: returns NULL if not found

-    const wxChar *GetString(const wxChar *sz, size_t n = size_t(-1)) const;
+    const wxString *GetString(const wxString& sz, size_t n = size_t(-1)) const;

 
     // public variable pointing to the next element in a linked list (or NULL)
     wxMsgCatalog *m_pNext;
 
     // public variable pointing to the next element in a linked list (or NULL)
     wxMsgCatalog *m_pNext;


@@ -1008,35 +1014,42 @@ static wxArrayString gs_searchPrefixes;
 
 wxMsgCatalogFile::wxMsgCatalogFile()
 {
 
 wxMsgCatalogFile::wxMsgCatalogFile()
 {

-    m_pData = NULL;
-    m_nSize = 0;

 }
 
 wxMsgCatalogFile::~wxMsgCatalogFile()
 {
 }
 
 wxMsgCatalogFile::~wxMsgCatalogFile()
 {

-    delete [] m_pData;

 }
 
 }
 

-// return the directory to search for message catalogs under the given prefix
+// return the directories to search for message catalogs under the given
+// prefix, separated by wxPATH_SEP

 static
 static

-wxString GetMsgCatalogSubdir(const wxChar *prefix, const wxChar *lang)
+wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)

 {
 {

-    wxString searchPath;
-    searchPath << prefix << wxFILE_SEP_PATH << lang;
+    // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in
+    // prefix/lang and finally in just prefix.
+    //
+    // Note that we use LC_MESSAGES on all platforms and not just Unix, because
+    // it doesn't cost much to look into one more directory and doing it this
+    // way has two important benefits:
+    // a) we don't break compatibility with wx-2.6 and older by stopping to
+    //    look in a directory where the catalogs used to be and thus silently
+    //    breaking apps after they are recompiled against the latest wx
+    // b) it makes it possible to package app's support files in the same
+    //    way on all target platforms
+    wxString pathPrefix;
+    pathPrefix << prefix << wxFILE_SEP_PATH << lang;

 
 

-    // under Unix, the message catalogs are supposed to go into LC_MESSAGES
-    // subdirectory so look there too
-#ifdef __UNIX__
-    const wxString searchPathOrig(searchPath);
-    searchPath << wxFILE_SEP_PATH << wxT("LC_MESSAGES")
-               << wxPATH_SEP << searchPathOrig;
-#endif // __UNIX__
+    wxString searchPath;
+    searchPath.reserve(4*pathPrefix.length());
+    searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
+               << prefix << wxFILE_SEP_PATH << wxPATH_SEP
+               << pathPrefix;

 
     return searchPath;
 }
 
 // construct the search path for the given language
 
     return searchPath;
 }
 
 // construct the search path for the given language

-static wxString GetFullSearchPath(const wxChar *lang)
+static wxString GetFullSearchPath(const wxString& lang)

 {
     // first take the entries explicitly added by the program
     wxArrayString paths;
 {
     // first take the entries explicitly added by the program
     wxArrayString paths;


@@ -1045,7 +1058,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
            count = gs_searchPrefixes.size();
     for ( n = 0; n < count; n++ )
     {
            count = gs_searchPrefixes.size();
     for ( n = 0; n < count; n++ )
     {

-        paths.Add(GetMsgCatalogSubdir(gs_searchPrefixes[n], lang));
+        paths.Add(GetMsgCatalogSubdirs(gs_searchPrefixes[n], lang));

     }
 
 
     }
 
 


@@ -1065,7 +1078,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
     const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
     if ( pszLcPath )
     {
     const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
     if ( pszLcPath )
     {

-        const wxString lcp = GetMsgCatalogSubdir(pszLcPath, lang);
+        const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);

         if ( paths.Index(lcp) == wxNOT_FOUND )
             paths.Add(lcp);
     }
         if ( paths.Index(lcp) == wxNOT_FOUND )
             paths.Add(lcp);
     }


@@ -1074,7 +1087,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
     wxString wxp = wxGetInstallPrefix();
     if ( !wxp.empty() )
     {
     wxString wxp = wxGetInstallPrefix();
     if ( !wxp.empty() )
     {

-        wxp = GetMsgCatalogSubdir(wxp + _T("/share/locale"), lang);
+        wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);

         if ( paths.Index(wxp) == wxNOT_FOUND )
             paths.Add(wxp);
     }
         if ( paths.Index(wxp) == wxNOT_FOUND )
             paths.Add(wxp);
     }


@@ -1096,7 +1109,7 @@ static wxString GetFullSearchPath(const wxChar *lang)
 }
 
 // open disk file and read in it's contents
 }
 
 // open disk file and read in it's contents

-bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
+bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,

                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {
   wxString searchPath;
                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {
   wxString searchPath;


@@ -1117,15 +1130,14 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
 
 
   searchPath += GetFullSearchPath(szDirPrefix);
 
 
   searchPath += GetFullSearchPath(szDirPrefix);

-  const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
-  if ( sublocale )
+  size_t sublocaleIndex = szDirPrefix.find(wxT('_'));
+  if ( sublocaleIndex != wxString::npos )

   {
       // also add just base locale name: for things like "fr_BE" (belgium
       // french) we should use "fr" if no belgium specific message catalogs
       // exist
       searchPath << wxPATH_SEP
   {
       // also add just base locale name: for things like "fr_BE" (belgium
       // french) we should use "fr" if no belgium specific message catalogs
       // exist
       searchPath << wxPATH_SEP

-                 << GetFullSearchPath(wxString(szDirPrefix).
-                                      Left((size_t)(sublocale - szDirPrefix)));
+                 << GetFullSearchPath(szDirPrefix.Left(sublocaleIndex));

   }
 
   // don't give translation errors here because the wxstd catalog might
   }
 
   // don't give translation errors here because the wxstd catalog might


@@ -1141,17 +1153,40 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
 
   wxFileName fn(szName);
   fn.SetExt(_T("mo"));
 
   wxFileName fn(szName);
   fn.SetExt(_T("mo"));

+

   wxString strFullName;
   wxString strFullName;

-  if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
+#if wxUSE_FILESYSTEM
+  wxFileSystem fileSys;
+  if ( !fileSys.FindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
+#else // !wxUSE_FILESYSTEM
+  if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
+#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
+  {

     wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
     wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
     return false;
   }
 
     wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
     wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
     return false;
   }
 

-  // open file
+  // open file and read its data

   wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
   wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str());
 
   wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
   wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str());
 

+#if wxUSE_FILESYSTEM
+  wxFSFile * const fileMsg = fileSys.OpenFile(strFullName);
+  if ( !fileMsg )
+    return false;
+
+  wxInputStream *fileStream = fileMsg->GetStream();
+  m_data.SetDataLen(0);
+
+  static const size_t chunkSize = 4096;
+  while ( !fileStream->Eof() ) {
+    fileStream->Read(m_data.GetAppendBuf(chunkSize), chunkSize);
+    m_data.UngetAppendBuf(fileStream->LastRead());
+  }
+
+  delete fileMsg;
+#else // !wxUSE_FILESYSTEM

   wxFile fileMsg(strFullName);
   if ( !fileMsg.IsOpened() )
     return false;
   wxFile fileMsg(strFullName);
   if ( !fileMsg.IsOpened() )
     return false;


@@ -1165,16 +1200,15 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
   wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
 
   // read the whole file in memory
   wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
 
   // read the whole file in memory

-  m_pData = new size_t8[nSize];
-  if ( fileMsg.Read(m_pData, nSize) != lenFile ) {
-    wxDELETEA(m_pData);
+  if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )

     return false;
     return false;

-  }
+#endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
+

 
   // examine header
 
   // examine header

-  bool bValid = nSize + (size_t)0 > sizeof(wxMsgCatalogHeader);
+  bool bValid = m_data.GetDataLen() > sizeof(wxMsgCatalogHeader);

 
 

-  wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
+  const wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_data.GetData();

   if ( bValid ) {
     // we'll have to swap all the integers if it's true
     m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW;
   if ( bValid ) {
     // we'll have to swap all the integers if it's true
     m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW;


@@ -1187,17 +1221,15 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
     // it's either too short or has incorrect magic number
     wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
 
     // it's either too short or has incorrect magic number
     wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
 

-    wxDELETEA(m_pData);

     return false;
   }
 
   // initialize
   m_numStrings  = Swap(pHeader->numStrings);
     return false;
   }
 
   // initialize
   m_numStrings  = Swap(pHeader->numStrings);

-  m_pOrigTable  = (wxMsgTableEntry *)(m_pData +
+  m_pOrigTable  = (wxMsgTableEntry *)(StringData() +

                    Swap(pHeader->ofsOrigTable));
                    Swap(pHeader->ofsOrigTable));

-  m_pTransTable = (wxMsgTableEntry *)(m_pData +
+  m_pTransTable = (wxMsgTableEntry *)(StringData() +

                    Swap(pHeader->ofsTransTable));
                    Swap(pHeader->ofsTransTable));

-  m_nSize = (size_t32)nSize;

 
   // now parse catalog's header and try to extract catalog charset and
   // plural forms formula from it:
 
   // now parse catalog's header and try to extract catalog charset and
   // plural forms formula from it:


@@ -1304,7 +1336,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
                             : new wxCSConv(msgIdCharset);
 
 #elif wxUSE_FONTMAP
                             : new wxCSConv(msgIdCharset);
 
 #elif wxUSE_FONTMAP

-    wxASSERT_MSG( msgIdCharset == NULL,
+    wxASSERT_MSG( msgIdCharset.empty(),

                   _T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
 
     wxEncodingConverter converter;
                   _T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
 
     wxEncodingConverter converter;


@@ -1374,7 +1406,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
                 msgstr = str;
 #else // !wxUSE_WCHAR_T
         #if wxUSE_FONTMAP
                 msgstr = str;
 #else // !wxUSE_WCHAR_T
         #if wxUSE_FONTMAP

-            if ( convertEncoding )
+            if ( bConvertEncoding )

                 msgstr = wxString(converter.Convert(str));
             else
         #endif
                 msgstr = wxString(converter.Convert(str));
             else
         #endif


@@ -1418,14 +1450,14 @@ wxMsgCatalog::~wxMsgCatalog()
     }
 }
 
     }
 }
 

-bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
-                        const wxChar *msgIdCharset, bool bConvertEncoding)
+bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
+                        const wxString& msgIdCharset, bool bConvertEncoding)

 {
     wxMsgCatalogFile file;
 
 {
     wxMsgCatalogFile file;
 

-    m_name = szName;
+    m_name = name;

 
 

-    if ( !file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
+    if ( !file.Load(dirPrefix, name, m_pluralFormsCalculator) )

         return false;
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
         return false;
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);


@@ -1449,7 +1481,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
     return true;
 }
 
     return true;
 }
 

-const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
+const wxString *wxMsgCatalog::GetString(const wxString& str, size_t n) const

 {
     int index = 0;
     if (n != size_t(-1))
 {
     int index = 0;
     if (n != size_t(-1))


@@ -1459,16 +1491,16 @@ const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
     wxMessagesHash::const_iterator i;
     if (index != 0)
     {
     wxMessagesHash::const_iterator i;
     if (index != 0)
     {

-        i = m_messages.find(wxString(sz) + wxChar(index));   // plural
+        i = m_messages.find(wxString(str) + wxChar(index));   // plural

     }
     else
     {
     }
     else
     {

-        i = m_messages.find(sz);
+        i = m_messages.find(str);

     }
 
     if ( i != m_messages.end() )
     {
     }
 
     if ( i != m_messages.end() )
     {

-        return i->second.c_str();
+        return &i->second;

     }
     else
         return NULL;
     }
     else
         return NULL;


@@ -1512,28 +1544,30 @@ void wxLocale::DoCommonInit()
 }
 
 // NB: this function has (desired) side effect of changing current locale
 }
 
 // NB: this function has (desired) side effect of changing current locale

-bool wxLocale::Init(const wxChar *szName,
-                    const wxChar *szShort,
-                    const wxChar *szLocale,
-                    bool        bLoadDefault,
-                    bool        bConvertEncoding)
+bool wxLocale::Init(const wxString& name,
+                    const wxString& shortName,
+                    const wxString& locale,
+                    bool            bLoadDefault,
+                    bool            bConvertEncoding)

 {
   wxASSERT_MSG( !m_initialized,
                 _T("you can't call wxLocale::Init more than once") );
 
   m_initialized = true;
 {
   wxASSERT_MSG( !m_initialized,
                 _T("you can't call wxLocale::Init more than once") );
 
   m_initialized = true;

-  m_strLocale = szName;
-  m_strShort = szShort;
+  m_strLocale = name;
+  m_strShort = shortName;

   m_bConvertEncoding = bConvertEncoding;
   m_language = wxLANGUAGE_UNKNOWN;
 
   // change current locale (default: same as long name)
   m_bConvertEncoding = bConvertEncoding;
   m_language = wxLANGUAGE_UNKNOWN;
 
   // change current locale (default: same as long name)

-  if ( szLocale == NULL )
+  wxString szLocale(locale);
+  if ( szLocale.empty() )

   {
     // the argument to setlocale()
   {
     // the argument to setlocale()

-    szLocale = szShort;
+    szLocale = shortName;

 
 

-    wxCHECK_MSG( szLocale, false, _T("no locale to set in wxLocale::Init()") );
+    wxCHECK_MSG( !szLocale.empty(), false,
+                 _T("no locale to set in wxLocale::Init()") );

   }
 
 #ifdef __WXWINCE__
   }
 
 #ifdef __WXWINCE__


@@ -1543,7 +1577,7 @@ bool wxLocale::Init(const wxChar *szName,
       256);
   if (ret != 0)
   {
       256);
   if (ret != 0)
   {

-    m_pszOldLocale = wxStrdup(localeName);
+    m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));

   }
   else
     m_pszOldLocale = NULL;
   }
   else
     m_pszOldLocale = NULL;


@@ -1551,7 +1585,7 @@ bool wxLocale::Init(const wxChar *szName,
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else
   // TODO: how to find languageId
   // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
 #else

-  wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, szLocale);
+  const char *oldLocale = wxSetlocale(LC_ALL, szLocale);

   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else
   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else


@@ -1566,10 +1600,10 @@ bool wxLocale::Init(const wxChar *szName,
   if ( m_strShort.empty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
   if ( m_strShort.empty() ) {
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong

-    if ( szLocale && szLocale[0] )
+    if ( !szLocale.empty() )

     {
         m_strShort += (wxChar)wxTolower(szLocale[0]);
     {
         m_strShort += (wxChar)wxTolower(szLocale[0]);

-        if ( szLocale[1] )
+        if ( szLocale.length() > 1 )

             m_strShort += (wxChar)wxTolower(szLocale[1]);
     }
   }
             m_strShort += (wxChar)wxTolower(szLocale[1]);
     }
   }


@@ -1585,7 +1619,7 @@ bool wxLocale::Init(const wxChar *szName,
     // an error if this does not exist
     if ( bOk )
     {
     // an error if this does not exist
     if ( bOk )
     {

-      wxString port(wxPlatformInfo().GetPortIdName());
+      wxString port(wxPlatformInfo::Get().GetPortIdName());

       if ( !port.empty() )
       {
         AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());
       if ( !port.empty() )
       {
         AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());


@@ -1598,39 +1632,50 @@ bool wxLocale::Init(const wxChar *szName,
 
 
 #if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)
 
 
 #if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)

-static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
+static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)

 {
 {

-    wxMB2WXbuf l = wxSetlocale(c, lc);
-    if ( !l && lc && lc[0] != 0 )
+    const char *l = NULL;
+
+    // NB: We prefer to set UTF-8 locale if it's possible and only fall back to
+    //     non-UTF-8 locale if it fails
+
+    if ( !lc.empty() )

     {
         wxString buf(lc);
         wxString buf2;
         buf2 = buf + wxT(".UTF-8");
     {
         wxString buf(lc);
         wxString buf2;
         buf2 = buf + wxT(".UTF-8");

-        l = wxSetlocale(c, buf2.c_str());
+        l = wxSetlocale(c, buf2);

         if ( !l )
         {
             buf2 = buf + wxT(".utf-8");
         if ( !l )
         {
             buf2 = buf + wxT(".utf-8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
         if ( !l )
         {
             buf2 = buf + wxT(".UTF8");
         }
         if ( !l )
         {
             buf2 = buf + wxT(".UTF8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
         if ( !l )
         {
             buf2 = buf + wxT(".utf8");
         }
         if ( !l )
         {
             buf2 = buf + wxT(".utf8");

-            l = wxSetlocale(c, buf2.c_str());
+            l = wxSetlocale(c, buf2);

         }
     }
         }
     }

+
+    // if we can't set UTF-8 locale, try non-UTF-8 one:
+    if ( !l )
+        l = wxSetlocale(c, lc);
+

     return l;
 }
 #else
     return l;
 }
 #else

-#define wxSetlocaleTryUTF(c, lc)  wxSetlocale(c, lc)
+#define wxSetlocaleTryUTF8(c, lc)  wxSetlocale(c, lc)

 #endif
 
 bool wxLocale::Init(int language, int flags)
 {
 #endif
 
 bool wxLocale::Init(int language, int flags)
 {

+    bool ret = true;
+

     int lang = language;
     if (lang == wxLANGUAGE_DEFAULT)
     {
     int lang = language;
     if (lang == wxLANGUAGE_DEFAULT)
     {


@@ -1659,18 +1704,18 @@ bool wxLocale::Init(int language, int flags)
 
     // Set the locale:
 #if defined(__OS2__)
 
     // Set the locale:
 #if defined(__OS2__)

-    wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
+    const char *retloc = wxSetlocale(LC_ALL , wxEmptyString);

 #elif defined(__UNIX__) && !defined(__WXMAC__)
     if (language != wxLANGUAGE_DEFAULT)
         locale = info->CanonicalName;
 
 #elif defined(__UNIX__) && !defined(__WXMAC__)
     if (language != wxLANGUAGE_DEFAULT)
         locale = info->CanonicalName;
 

-    wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+    const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale);

 
     const wxString langOnly = locale.Left(2);
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
 
     const wxString langOnly = locale.Left(2);
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only

-        retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
+        retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly);

     }
 
 #if wxUSE_FONTMAP
     }
 
 #if wxUSE_FONTMAP


@@ -1711,28 +1756,26 @@ bool wxLocale::Init(int language, int flags)
 
         if ( !localeAlt.empty() )
         {
 
         if ( !localeAlt.empty() )
         {

-            retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+            retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);

             if ( !retloc )
             if ( !retloc )

-                retloc = wxSetlocaleTryUTF(LC_ALL, locale.Left(2));
+                retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt.Left(2));

         }
     }
 
     if ( !retloc )
         }
     }
 
     if ( !retloc )

-    {
-        wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
-        return false;
-    }
+        ret = false;

 
 #ifdef __AIX__
 
 #ifdef __AIX__

-    // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL)
-    // can't be passed back to it because it returns 6 strings (one for each locale
-    // category), i.e. for C locale we get back "C C C C C C"
+    // at least in AIX 5.2 libc is buggy and the string returned from
+    // setlocale(LC_ALL) can't be passed back to it because it returns 6
+    // strings (one for each locale category), i.e. for C locale we get back
+    // "C C C C C C"

     //
     //

-    // this contradicts IBM own docs but this is not of much help, so just work around
-    // it in the crudest possible manner
-    wxChar *p = wxStrchr((wxChar *)retloc, _T(' '));
+    // this contradicts IBM own docs but this is not of much help, so just work
+    // around it in the crudest possible manner
+    char* p = const_cast<char*>(wxStrchr(retloc, ' '));

     if ( p )
     if ( p )

-        *p = _T('\0');
+        *p = '\0';

 #endif // __AIX__
 
 #elif defined(__WIN32__)
 #endif // __AIX__
 
 #elif defined(__WIN32__)


@@ -1747,10 +1790,7 @@ bool wxLocale::Init(int language, int flags)
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif
 
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif
 

-#if !wxUSE_UNICODE
-    const
-#endif
-    wxMB2WXbuf retloc = wxT("C");
+    const char *retloc = "C";

     if (language != wxLANGUAGE_DEFAULT)
     {
         if (info->WinLang == 0)
     if (language != wxLANGUAGE_DEFAULT)
     {
         if (info->WinLang == 0)


@@ -1789,8 +1829,7 @@ bool wxLocale::Init(int language, int flags)
             if (locale.empty())
             {
                 wxLogLastError(wxT("SetThreadLocale"));
             if (locale.empty())
             {
                 wxLogLastError(wxT("SetThreadLocale"));

-                wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
-                return false;
+                ret = false;

             }
             else
             {
             }
             else
             {


@@ -1799,9 +1838,9 @@ bool wxLocale::Init(int language, int flags)
                 retloc = wxSetlocale(LC_ALL, locale);
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
                 retloc = wxSetlocale(LC_ALL, locale);
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS

-                if (codepage == 0 && (const wxChar*)retloc == NULL)
+                if (codepage == 0 && retloc == NULL)

                 {
                 {

-                    retloc = wxT("C");
+                    retloc = "C";

                 }
 #endif
             }
                 }
 #endif
             }


@@ -1816,42 +1855,34 @@ bool wxLocale::Init(int language, int flags)
         retloc = NULL;
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
         retloc = NULL;
 #endif
 #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS

-        if ((const wxChar*)retloc == NULL)
+        if (retloc == NULL)

         {
             wxChar buffer[16];
             if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                               LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
                  wxStrcmp(buffer, wxT("0")) == 0)
             {
         {
             wxChar buffer[16];
             if (GetLocaleInfo(LOCALE_USER_DEFAULT,
                               LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
                  wxStrcmp(buffer, wxT("0")) == 0)
             {

-                retloc = wxT("C");
+                retloc = "C";

             }
         }
 #endif
     }
 
     if ( !retloc )
             }
         }
 #endif
     }
 
     if ( !retloc )

-    {
-        wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
-        return false;
-    }
+        ret = false;

 #elif defined(__WXMAC__)
     if (lang == wxLANGUAGE_DEFAULT)
         locale = wxEmptyString;
     else
         locale = info->CanonicalName;
 
 #elif defined(__WXMAC__)
     if (lang == wxLANGUAGE_DEFAULT)
         locale = wxEmptyString;
     else
         locale = info->CanonicalName;
 

-    wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
+    const char *retloc = wxSetlocale(LC_ALL, locale);

 
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
         retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
     }
 
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
         retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
     }

-    if ( !retloc )
-    {
-        wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
-        return false;
-    }

 #else
     wxUnusedVar(flags);
     return false;
 #else
     wxUnusedVar(flags);
     return false;


@@ -1859,11 +1890,20 @@ bool wxLocale::Init(int language, int flags)
 #endif
 
 #ifndef WX_NO_LOCALE_SUPPORT
 #endif
 
 #ifndef WX_NO_LOCALE_SUPPORT

-    wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
-    bool ret = Init(name, canonical, szLocale,
-                    (flags & wxLOCALE_LOAD_DEFAULT) != 0,
-                    (flags & wxLOCALE_CONV_ENCODING) != 0);
-    free(szLocale);
+    if ( !ret )
+    {
+        wxLogWarning(_("Cannot set locale to language \"%s\"."), name.c_str());
+
+        // continue nevertheless and try to load at least the translations for
+        // this language
+    }
+
+    if ( !Init(name, canonical, retloc,
+               (flags & wxLOCALE_LOAD_DEFAULT) != 0,
+               (flags & wxLOCALE_CONV_ENCODING) != 0) )
+    {
+        ret = false;
+    }

 
     if (IsOk()) // setlocale() succeeded
         m_language = lang;
 
     if (IsOk()) // setlocale() succeeded
         m_language = lang;


@@ -1898,14 +1938,14 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
         !wxGetEnv(wxT("LANG"), &langFull))
     {
         !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
         !wxGetEnv(wxT("LANG"), &langFull))
     {

-        // no language specified, threat it as English
-        return wxLANGUAGE_ENGLISH;
+        // no language specified, treat it as English
+        return wxLANGUAGE_ENGLISH_US;

     }
 
     if ( langFull == _T("C") || langFull == _T("POSIX") )
     {
     }
 
     if ( langFull == _T("C") || langFull == _T("POSIX") )
     {

-        // default C locale
-        return wxLANGUAGE_ENGLISH;
+        // default C locale is English too
+        return wxLANGUAGE_ENGLISH_US;

     }
 
     // the language string has the following form
     }
 
     // the language string has the following form


@@ -2438,11 +2478,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
     }
 #elif defined(__WXMAC__)
     TextEncoding encoding = 0 ;
     }
 #elif defined(__WXMAC__)
     TextEncoding encoding = 0 ;

-#if TARGET_CARBON

     encoding = CFStringGetSystemEncoding() ;
     encoding = CFStringGetSystemEncoding() ;

-#else
-    UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
-#endif

     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     const wxString encname = GetSystemEncodingName();
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     const wxString encname = GetSystemEncodingName();


@@ -2466,7 +2502,13 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
         // backwards compatibility and just take care to not return
         // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
         // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
         // backwards compatibility and just take care to not return
         // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense

-        if ( enc != wxFONTENCODING_MAX && enc != wxFONTENCODING_DEFAULT )
+        if ( enc == wxFONTENCODING_DEFAULT )
+        {
+            // we don't have wxFONTENCODING_ASCII, so use the closest one
+            return wxFONTENCODING_ISO8859_1;
+        }
+
+        if ( enc != wxFONTENCODING_MAX )

         {
             return enc;
         }
         {
             return enc;
         }


@@ -2499,7 +2541,9 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
     {
         if ( ms_languagesDB->Item(i).Language == lang )
         {
     {
         if ( ms_languagesDB->Item(i).Language == lang )
         {

-            return &ms_languagesDB->Item(i);
+            // We need to create a temporary here in order to make this work with BCC in final build mode
+            wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
+            return ptr;

         }
     }
 
         }
     }
 


@@ -2542,7 +2586,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
             // looking
             //
             // OTOH, maybe we had already found a language match and in this
             // looking
             //
             // OTOH, maybe we had already found a language match and in this

-            // case don't overwrite it becauce the entry for the default
+            // case don't overwrite it because the entry for the default

             // country always appears first in ms_languagesDB
             if ( !infoRet )
                 infoRet = info;
             // country always appears first in ms_languagesDB
             if ( !infoRet )
                 infoRet = info;


@@ -2584,43 +2628,43 @@ wxLocale::~wxLocale()
 }
 
 // get the translation of given string in current locale
 }
 
 // get the translation of given string in current locale

-const wxChar *wxLocale::GetString(const wxChar *szOrigString,
-                                  const wxChar *szDomain) const
+const wxString& wxLocale::GetString(const wxString& origString,
+                                    const wxString& domain) const

 {
 {

-    return GetString(szOrigString, szOrigString, size_t(-1), szDomain);
+    return GetString(origString, origString, size_t(-1), domain);

 }
 
 }
 

-const wxChar *wxLocale::GetString(const wxChar *szOrigString,
-                                  const wxChar *szOrigString2,
-                                  size_t n,
-                                  const wxChar *szDomain) const
+const wxString& wxLocale::GetString(const wxString& origString,
+                                    const wxString& origString2,
+                                    size_t n,
+                                    const wxString& domain) const

 {
 {

-    if ( wxIsEmpty(szOrigString) )
-        return wxEmptyString;
+    if ( origString.empty() )
+        return GetUntranslatedString(origString);

 
 

-    const wxChar *pszTrans = NULL;
+    const wxString *trans = NULL;

     wxMsgCatalog *pMsgCat;
 
     wxMsgCatalog *pMsgCat;
 

-    if ( szDomain != NULL )
+    if ( !domain.empty() )

     {
     {

-        pMsgCat = FindCatalog(szDomain);
+        pMsgCat = FindCatalog(domain);

 
         // does the catalog exist?
         if ( pMsgCat != NULL )
 
         // does the catalog exist?
         if ( pMsgCat != NULL )

-            pszTrans = pMsgCat->GetString(szOrigString, n);
+            trans = pMsgCat->GetString(origString, n);

     }
     else
     {
         // search in all domains
         for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
         {
     }
     else
     {
         // search in all domains
         for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
         {

-            pszTrans = pMsgCat->GetString(szOrigString, n);
-            if ( pszTrans != NULL )   // take the first found
+            trans = pMsgCat->GetString(origString, n);
+            if ( trans != NULL )   // take the first found

                 break;
         }
     }
 
                 break;
         }
     }
 

-    if ( pszTrans == NULL )
+    if ( trans == NULL )

     {
 #ifdef __WXDEBUG__
         if ( !NoTransErr::Suppress() )
     {
 #ifdef __WXDEBUG__
         if ( !NoTransErr::Suppress() )


@@ -2629,82 +2673,95 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
 
             wxLogTrace(TRACE_I18N,
                        _T("string \"%s\"[%ld] not found in %slocale '%s'."),
 
             wxLogTrace(TRACE_I18N,
                        _T("string \"%s\"[%ld] not found in %slocale '%s'."),

-                       szOrigString, (long)n,
-                       szDomain ? wxString::Format(_T("domain '%s' "), szDomain).c_str()
-                                : _T(""),
+                       origString, (long)n,
+                       domain.empty()
+                         ? (const wxChar*)wxString::Format(_T("domain '%s' "), domain).c_str()
+                         : _T(""),

                        m_strLocale.c_str());
         }
 #endif // __WXDEBUG__
 
         if (n == size_t(-1))
                        m_strLocale.c_str());
         }
 #endif // __WXDEBUG__
 
         if (n == size_t(-1))

-            return szOrigString;
+            return GetUntranslatedString(origString);

         else
         else

-            return n == 1 ? szOrigString : szOrigString2;
+            return GetUntranslatedString(n == 1 ? origString : origString2);

     }
 
     }
 

-    return pszTrans;
+    return *trans;

 }
 
 }
 

-wxString wxLocale::GetHeaderValue( const wxChar* szHeader,
-                                   const wxChar* szDomain ) const
+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual,
+                    wxLocaleUntranslatedStrings);
+
+/* static */
+const wxString& wxLocale::GetUntranslatedString(const wxString& str)

 {
 {

-    if ( wxIsEmpty(szHeader) )
+    static wxLocaleUntranslatedStrings s_strings;
+
+    wxLocaleUntranslatedStrings::iterator i = s_strings.find(str);
+    if ( i == s_strings.end() )
+        return *s_strings.insert(str).first;
+
+    return *i;
+}
+
+wxString wxLocale::GetHeaderValue(const wxString& header,
+                                  const wxString& domain) const
+{
+    if ( header.empty() )

         return wxEmptyString;
 
         return wxEmptyString;
 

-    wxChar const * pszTrans = NULL;
+    const wxString *trans = NULL;

     wxMsgCatalog *pMsgCat;
 
     wxMsgCatalog *pMsgCat;
 

-    if ( szDomain != NULL )
+    if ( !domain.empty() )

     {
     {

-        pMsgCat = FindCatalog(szDomain);
+        pMsgCat = FindCatalog(domain);

 
         // does the catalog exist?
         if ( pMsgCat == NULL )
             return wxEmptyString;
 
 
         // does the catalog exist?
         if ( pMsgCat == NULL )
             return wxEmptyString;
 

-        pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+        trans = pMsgCat->GetString(wxEmptyString, (size_t)-1);

     }
     else
     {
         // search in all domains
         for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
         {
     }
     else
     {
         // search in all domains
         for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
         {

-            pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
-            if ( pszTrans != NULL )   // take the first found
+            trans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+            if ( trans != NULL )   // take the first found

                 break;
         }
     }
 
                 break;
         }
     }
 

-    if ( wxIsEmpty(pszTrans) )
+    if ( !trans || trans->empty() )

       return wxEmptyString;
 
       return wxEmptyString;
 

-    wxChar const * pszFound = wxStrstr(pszTrans, szHeader);
-    if ( pszFound == NULL )
+    size_t found = trans->find(header);
+    if ( found == wxString::npos )

       return wxEmptyString;
 
       return wxEmptyString;
 

-    pszFound += wxStrlen(szHeader) + 2 /* ': ' */;
+    found += header.length() + 2 /* ': ' */;

 
     // Every header is separated by \n
 
 
     // Every header is separated by \n
 

-    wxChar const * pszEndLine = wxStrchr(pszFound, wxT('\n'));
-    if ( pszEndLine == NULL ) pszEndLine = pszFound + wxStrlen(pszFound);
-
-
-    // wxString( wxChar*, length);
-    wxString retVal( pszFound, pszEndLine - pszFound );
+    size_t endLine = trans->find(wxT('\n'), found);
+    size_t len = (endLine == wxString::npos) ?
+                 wxString::npos : (endLine - found);

 
 

-    return retVal;
+    return trans->substr(found, len);

 }
 
 
 // find catalog by name in a linked list, return NULL if !found
 }
 
 
 // find catalog by name in a linked list, return NULL if !found

-wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
+wxMsgCatalog *wxLocale::FindCatalog(const wxString& domain) const

 {
     // linear search in the linked list
     wxMsgCatalog *pMsgCat;
     for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
     {
 {
     // linear search in the linked list
     wxMsgCatalog *pMsgCat;
     for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
     {

-        if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )
+        if ( pMsgCat->GetName() == domain )

           return pMsgCat;
     }
 
           return pMsgCat;
     }
 


@@ -2718,7 +2775,7 @@ bool wxLocale::IsAvailable(int lang)
     const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
     wxCHECK_MSG( info, false, _T("invalid language") );
 
     const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
     wxCHECK_MSG( info, false, _T("invalid language") );
 

-#ifdef __WIN32__
+#if defined(__WIN32__)

     if ( !info->WinLang )
         return false;
 
     if ( !info->WinLang )
         return false;
 


@@ -2728,30 +2785,43 @@ bool wxLocale::IsAvailable(int lang)
                          SORT_DEFAULT),
                 LCID_INSTALLED
             ) )
                          SORT_DEFAULT),
                 LCID_INSTALLED
             ) )

-      return false;
-#else // !__WIN32__
-    // TODO: test if setlocale(info->CanonicalName) works under other OS?
-#endif // __WIN32__/!__WIN32__
+        return false;
+
+#elif defined(__UNIX__)
+
+    // Test if setting the locale works, then set it back.
+    const char *oldLocale = wxSetlocale(LC_ALL, "");
+    const char *tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName);
+    if ( !tmp )
+    {
+        // Some C libraries don't like xx_YY form and require xx only
+        tmp = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName.Left(2));
+        if ( !tmp )
+            return false;
+    }
+    // restore the original locale
+    wxSetlocale(LC_ALL, oldLocale);
+#endif

 
     return true;
 }
 
 // check if the given catalog is loaded
 
     return true;
 }
 
 // check if the given catalog is loaded

-bool wxLocale::IsLoaded(const wxChar *szDomain) const
+bool wxLocale::IsLoaded(const wxString& szDomain) const

 {
   return FindCatalog(szDomain) != NULL;
 }
 
 // add a catalog to our linked list
 {
   return FindCatalog(szDomain) != NULL;
 }
 
 // add a catalog to our linked list

-bool wxLocale::AddCatalog(const wxChar *szDomain)
+bool wxLocale::AddCatalog(const wxString& szDomain)

 {
 {

-    return AddCatalog(szDomain, wxLANGUAGE_ENGLISH, NULL);
+    return AddCatalog(szDomain, wxLANGUAGE_ENGLISH_US, wxEmptyString);

 }
 
 // add a catalog to our linked list
 }
 
 // add a catalog to our linked list

-bool wxLocale::AddCatalog(const wxChar *szDomain,
-                          wxLanguage    msgIdLanguage,
-                          const wxChar *msgIdCharset)
+bool wxLocale::AddCatalog(const wxString& szDomain,
+                          wxLanguage      msgIdLanguage,
+                          const wxString& msgIdCharset)

 
 {
   wxMsgCatalog *pMsgCat = new wxMsgCatalog;
 
 {
   wxMsgCatalog *pMsgCat = new wxMsgCatalog;


@@ -2792,7 +2862,7 @@ bool wxLocale::AddCatalog(const wxChar *szDomain,
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))


@@ -2832,7 +2902,33 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str;
 }
 
     return str;
 }
 

-#else // !__WXMSW__
+#elif defined(__DARWIN__)
+
+/* static */
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
+{
+    wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
+    CFTypeRef cfstr;
+    switch ( index )
+    {
+        case wxLOCALE_THOUSANDS_SEP:
+            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+            break;
+
+        case wxLOCALE_DECIMAL_POINT:
+            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+            break;
+
+        default:
+            wxFAIL_MSG( "Unknown locale info" );
+    }
+
+    wxMacCFStringHolder
+        str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+    return str.AsString();
+}
+
+#else // !__WXMSW__ && !__DARWIN__

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)


@@ -2869,7 +2965,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
     }
 }
 
     }
 }
 

-#endif // __WXMSW__/!__WXMSW__
+#endif // platform

 
 // ----------------------------------------------------------------------------
 // global functions and variables
 
 // ----------------------------------------------------------------------------
 // global functions and variables