fixed warnings about pointer to integer cast

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 57d31cf4bbc003e97acdeb5291842eef974dfe0e..31332b83ba557238841a5fa852c13997f33e7dde 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/intl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/intl.cpp

-// Purpose:     Internationalization and localisation for wxWindows
+// Purpose:     Internationalization and localisation for wxWidgets

 // Author:      Vadim Zeitlin
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)
 // Author:      Vadim Zeitlin
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - PluralForms support)


@@ -18,8 +18,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "intl.h"
+#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
+#endif
+
+#ifdef __EMX__
+// The following define is needed by Innotek's libc to
+// make the definition of struct localeconv available.
+#define __INTERNAL_DEFS

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -43,7 +51,7 @@
   #include <langinfo.h>
 #endif
 
   #include <langinfo.h>
 #endif
 

-// wxWindows
+// wxWidgets

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"


@@ -60,12 +68,15 @@
 #endif
 
 #include "wx/file.h"
 #endif
 
 #include "wx/file.h"

+#include "wx/filename.h"

 #include "wx/tokenzr.h"
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/encconv.h"
 #include "wx/hashmap.h"
 #include "wx/ptr_scpd.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/encconv.h"
 #include "wx/hashmap.h"
 #include "wx/ptr_scpd.h"

+#include "wx/app.h"
+#include "wx/apptrait.h"

 
 #if defined(__WXMAC__)
   #include  "wx/mac/private.h"  // includes mac headers
 
 #if defined(__WXMAC__)
   #include  "wx/mac/private.h"  // includes mac headers


@@ -87,14 +98,13 @@ typedef wxUint32 size_t32;
 const size_t32 MSGCATALOG_MAGIC    = 0x950412de;
 const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
 
 const size_t32 MSGCATALOG_MAGIC    = 0x950412de;
 const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
 

-// extension of ".mo" files
-#define MSGCATALOG_EXTENSION  _T(".mo")
-

 // the constants describing the format of lang_LANG locale string
 static const size_t LEN_LANG = 2;
 static const size_t LEN_SUBLANG = 2;
 static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_'
 
 // the constants describing the format of lang_LANG locale string
 static const size_t LEN_LANG = 2;
 static const size_t LEN_SUBLANG = 2;
 static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_'
 

+#define TRACE_I18N _T("i18n")
+

 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------


@@ -151,7 +161,7 @@ static inline wxString ExtractNotLang(const wxString& langFull)
 // Plural forms parser
 // ----------------------------------------------------------------------------
 
 // Plural forms parser
 // ----------------------------------------------------------------------------
 

-/* 
+/*

                                 Simplified Grammar
 
 Expression:
                                 Simplified Grammar
 
 Expression:


@@ -177,7 +187,7 @@ RelationalExpression:
     MultiplicativeExpression ">=" MultiplicativeExpression
     MultiplicativeExpression "<=" MultiplicativeExpression
     MultiplicativeExpression
     MultiplicativeExpression ">=" MultiplicativeExpression
     MultiplicativeExpression "<=" MultiplicativeExpression
     MultiplicativeExpression

-    
+

 MultiplicativeExpression:
     PmExpression '%' PmExpression
     PmExpression
 MultiplicativeExpression:
     PmExpression '%' PmExpression
     PmExpression


@@ -389,7 +399,7 @@ private:
     wxPluralFormsToken m_token;
     wxPluralFormsNodePtr m_nodes[3];
 };
     wxPluralFormsToken m_token;
     wxPluralFormsNodePtr m_nodes[3];
 };

-    
+

 wxPluralFormsNodePtr::~wxPluralFormsNodePtr()
 {
     delete m_p;
 wxPluralFormsNodePtr::~wxPluralFormsNodePtr()
 {
     delete m_p;


@@ -474,7 +484,7 @@ class wxPluralFormsCalculator
 {
 public:
     wxPluralFormsCalculator() : m_nplurals(0), m_plural(0) {}
 {
 public:
     wxPluralFormsCalculator() : m_nplurals(0), m_plural(0) {}

-    
+

     // input: number, returns msgstr index
     int evaluate(int n) const;
 
     // input: number, returns msgstr index
     int evaluate(int n) const;
 


@@ -486,14 +496,13 @@ public:
     ~wxPluralFormsCalculator() {}
 
     void  init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural);
     ~wxPluralFormsCalculator() {}
 
     void  init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural);

-    wxString getString() const;
-    
+

 private:
     wxPluralFormsToken::Number m_nplurals;
     wxPluralFormsNodePtr m_plural;
 };
 
 private:
     wxPluralFormsToken::Number m_nplurals;
     wxPluralFormsNodePtr m_plural;
 };
 

-wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator);
+wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator)

 
 void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals,
                                    wxPluralFormsNode* plural)
 
 void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals,
                                    wxPluralFormsNode* plural)


@@ -529,7 +538,7 @@ private:
     wxPluralFormsScanner& m_scanner;
     const wxPluralFormsToken& token() const;
     bool nextToken();
     wxPluralFormsScanner& m_scanner;
     const wxPluralFormsToken& token() const;
     bool nextToken();

-    
+

     wxPluralFormsNode* expression();
     wxPluralFormsNode* logicalOrExpression();
     wxPluralFormsNode* logicalAndExpression();
     wxPluralFormsNode* expression();
     wxPluralFormsNode* logicalOrExpression();
     wxPluralFormsNode* logicalAndExpression();


@@ -875,7 +884,8 @@ public:
               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs
               wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
 
     // fills the hash with string-translation pairs

-    void FillHash(wxMessagesHash& hash, bool convertEncoding) const;
+    void FillHash(wxMessagesHash& hash, const wxString& msgIdCharset,
+                  bool convertEncoding) const;

 
 private:
     // this implementation is binary compatible with GNU gettext() version 0.10
 
 private:
     // this implementation is binary compatible with GNU gettext() version 0.10


@@ -911,7 +921,7 @@ private:
                      *m_pTransTable;  //            translated
 
     wxString m_charset;
                      *m_pTransTable;  //            translated
 
     wxString m_charset;

-                     
+

     // swap the 2 halves of 32 bit integer if needed
     size_t32 Swap(size_t32 ui) const
     {
     // swap the 2 halves of 32 bit integer if needed
     size_t32 Swap(size_t32 ui) const
     {


@@ -932,7 +942,7 @@ private:
         }
 
         return (const char *)(m_pData + ofsString);
         }
 
         return (const char *)(m_pData + ofsString);

-    }    
+    }

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


@@ -951,7 +961,8 @@ class wxMsgCatalog
 {
 public:
     // load the catalog from disk (szDirPrefix corresponds to language)
 {
 public:
     // load the catalog from disk (szDirPrefix corresponds to language)

-    bool Load(const wxChar *szDirPrefix, const wxChar *szName, bool bConvertEncoding = FALSE);
+    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
+              const wxChar *msgIdCharset = NULL, bool bConvertEncoding = false);

 
     // get name of the catalog
     wxString GetName() const { return m_name; }
 
     // get name of the catalog
     wxString GetName() const { return m_name; }


@@ -1023,6 +1034,8 @@ static wxString GetFullSearchPath(const wxChar *lang)
                    << wxPATH_SEP;
     }
 
                    << wxPATH_SEP;
     }
 

+    // TODO: use wxStandardPaths instead of all this mess!!
+

     // LC_PATH is a standard env var containing the search path for the .mo
     // files
 #ifndef __WXWINCE__
     // LC_PATH is a standard env var containing the search path for the .mo
     // files
 #ifndef __WXWINCE__


@@ -1042,32 +1055,43 @@ static wxString GetFullSearchPath(const wxChar *lang)
 
     // then take the current directory
     // FIXME it should be the directory of the executable
 
     // then take the current directory
     // FIXME it should be the directory of the executable

-#ifdef __WXMAC__
-    wxChar cwd[512] ;
-    wxGetWorkingDirectory( cwd , sizeof( cwd ) ) ;
-    searchPath << GetAllMsgCatalogSubdirs(cwd, lang);
+#if defined(__WXMAC__)
+    searchPath << GetAllMsgCatalogSubdirs(wxGetCwd(), lang);

     // generic search paths could be somewhere in the system folder preferences
     // generic search paths could be somewhere in the system folder preferences

-#else // !Mac
+#elif defined(__WXMSW__)
+    // look in the directory of the executable
+    wxString path;
+    wxSplitPath(wxGetFullModuleName(), &path, NULL, NULL);
+    searchPath << GetAllMsgCatalogSubdirs(path, lang);
+#else // !Mac, !MSW

     searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
     searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);

-

 #endif // platform
 
     return searchPath;
 }
 
 // open disk file and read in it's contents
 #endif // platform
 
     return searchPath;
 }
 
 // open disk file and read in it's contents

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

                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {
                             wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
 {

-   /* We need to handle locales like  de_AT.iso-8859-1
-      For this we first chop off the .CHARSET specifier and ignore it.
-      FIXME: UNICODE SUPPORT: must use CHARSET specifier!
-   */
-   wxString szName = szName0;
-   if(szName.Find(wxT('.')) != -1) // contains a dot
-      szName = szName.Left(szName.Find(wxT('.')));
+  wxString searchPath;

 
 

-  wxString searchPath = GetFullSearchPath(szDirPrefix);
+#if wxUSE_FONTMAP
+  // first look for the catalog for this language and the current locale:
+  // notice that we don't use the system name for the locale as this would
+  // force us to install catalogs in different locations depending on the
+  // system but always use the canonical name
+  wxFontEncoding encSys = wxLocale::GetSystemEncoding();
+  if ( encSys != wxFONTENCODING_SYSTEM )
+  {
+    wxString fullname(szDirPrefix);
+    fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys);
+    searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
+  }
+#endif // wxUSE_FONTMAP
+
+
+  searchPath += GetFullSearchPath(szDirPrefix);

   const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
   if ( sublocale )
   {
   const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
   if ( sublocale )
   {


@@ -1079,9 +1103,6 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
                  << wxPATH_SEP;
   }
 
                  << wxPATH_SEP;
   }
 

-  wxString strFile = szName;
-  strFile += MSGCATALOG_EXTENSION;
-

   // don't give translation errors here because the wxstd catalog might
   // not yet be loaded (and it's normal)
   //
   // don't give translation errors here because the wxstd catalog might
   // not yet be loaded (and it's normal)
   //


@@ -1089,36 +1110,44 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
 
   NoTransErr noTransErr;
   wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
 
   NoTransErr noTransErr;
   wxLogVerbose(_("looking for catalog '%s' in path '%s'."),

-               szName.c_str(), searchPath.c_str());
+               szName, searchPath.c_str());
+  wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""),
+             szName, searchPath.c_str());

 
 

+  wxFileName fn(szName);
+  fn.SetExt(_T("mo"));

   wxString strFullName;
   wxString strFullName;

-  if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {
-    wxLogVerbose(_("catalog file for domain '%s' not found."), szName.c_str());
-    return FALSE;
+  if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
+    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

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

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

-    return FALSE;
+    return false;

 
 

-  // get the file size
-  off_t nSize = fileMsg.Length();
-  if ( nSize == wxInvalidOffset )
-    return FALSE;
+  // get the file size (assume it is less than 4Gb...)
+  wxFileOffset lenFile = fileMsg.Length();
+  if ( lenFile == wxInvalidOffset )
+    return false;
+
+  size_t nSize = wx_truncate_cast(size_t, lenFile);
+  wxASSERT_MSG( nSize == lenFile, _T("message catalog bigger than 4GB?") );

 
   // read the whole file in memory
   m_pData = new size_t8[nSize];
 
   // read the whole file in memory
   m_pData = new size_t8[nSize];

-  if ( fileMsg.Read(m_pData, nSize) != nSize ) {
+  if ( fileMsg.Read(m_pData, nSize) != lenFile ) {

     wxDELETEA(m_pData);
     wxDELETEA(m_pData);

-    return FALSE;
+    return false;

   }
 
   // examine header
   }
 
   // examine header

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

 
   wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
   if ( bValid ) {
 
   wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
   if ( bValid ) {


@@ -1134,7 +1163,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
     wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
 
     wxDELETEA(m_pData);
     wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
 
     wxDELETEA(m_pData);

-    return FALSE;
+    return false;

   }
 
   // initialize
   }
 
   // initialize


@@ -1143,8 +1172,8 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
                    Swap(pHeader->ofsOrigTable));
   m_pTransTable = (wxMsgTableEntry *)(m_pData +
                    Swap(pHeader->ofsTransTable));
                    Swap(pHeader->ofsOrigTable));
   m_pTransTable = (wxMsgTableEntry *)(m_pData +
                    Swap(pHeader->ofsTransTable));

-  m_nSize = nSize;
-    
+  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:
 


@@ -1169,7 +1198,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
           }
       }
       // else: incorrectly filled Content-Type header
           }
       }
       // else: incorrectly filled Content-Type header

-      
+

       // Extract plural forms:
       begin = header.Find(wxT("Plural-Forms:"));
       if (begin != wxNOT_FOUND)
       // Extract plural forms:
       begin = header.Find(wxT("Plural-Forms:"));
       if (begin != wxNOT_FOUND)


@@ -1187,8 +1216,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
               }
               else
               {
               }
               else
               {

-                   wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"),
-                          pfs.c_str());
+                   wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), pfs.c_str());

               }
           }
       }
               }
           }
       }


@@ -1202,23 +1230,59 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
   return true;
 }
 
   return true;
 }
 

-void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) const
+void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
+                                const wxString& msgIdCharset,
+                                bool convertEncoding) const

 {
 {

+#if wxUSE_FONTMAP
+    // determine if we need any conversion at all
+    if ( convertEncoding )
+    {
+        wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
+        if ( encCat == wxLocale::GetSystemEncoding() )
+        {
+            // no need to convert
+            convertEncoding = false;
+        }
+    }
+#endif // wxUSE_FONTMAP
+

 #if wxUSE_WCHAR_T
 #if wxUSE_WCHAR_T

-    wxCSConv *csConv = NULL;
-    if ( !!m_charset )
-        csConv = new wxCSConv(m_charset);
+    // conversion to use to convert catalog strings to the GUI encoding
+    wxMBConv *inputConv,
+             *csConv = NULL; // another ptr just to be able to delete it later
+    if ( convertEncoding )
+    {
+        if ( m_charset.empty() )
+            inputConv = wxConvCurrent;
+        else
+            inputConv =
+            csConv = new wxCSConv(m_charset);
+    }
+    else // no conversion needed
+    {
+        inputConv = NULL;
+    }
+
+    // conversion to apply to msgid strings before looking them up: we only
+    // need it if the msgids are neither in 7 bit ASCII nor in the same
+    // encoding as the catalog
+    wxCSConv *sourceConv = msgIdCharset.empty() || (msgIdCharset == m_charset)
+                            ? NULL
+                            : new wxCSConv(msgIdCharset);

 
 

-    wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent;

 #elif wxUSE_FONTMAP
 #elif wxUSE_FONTMAP

+    wxASSERT_MSG( msgIdCharset == NULL,
+                  _T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
+

     wxEncodingConverter converter;
     if ( convertEncoding )
     {
         wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
     wxEncodingConverter converter;
     if ( convertEncoding )
     {
         wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;

-        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(m_charset, FALSE);
+        wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(m_charset, false);

         if ( enc == wxFONTENCODING_SYSTEM )
         {
         if ( enc == wxFONTENCODING_SYSTEM )
         {

-            convertEncoding = FALSE; // unknown encoding
+            convertEncoding = false; // unknown encoding

         }
         else
         {
         }
         else
         {


@@ -1228,10 +1292,10 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
                 wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
                 if (a[0] == enc)
                     // no conversion needed, locale uses native encoding
                 wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
                 if (a[0] == enc)
                     // no conversion needed, locale uses native encoding

-                    convertEncoding = FALSE;
+                    convertEncoding = false;

                 if (a.GetCount() == 0)
                     // we don't know common equiv. under this platform
                 if (a.GetCount() == 0)
                     // we don't know common equiv. under this platform

-                    convertEncoding = FALSE;
+                    convertEncoding = false;

                 targetEnc = a[0];
             }
         }
                 targetEnc = a[0];
             }
         }


@@ -1247,11 +1311,17 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     for (size_t i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);
     for (size_t i = 0; i < m_numStrings; i++)
     {
         const char *data = StringAtOfs(m_pOrigTable, i);

+#if wxUSE_UNICODE
+        wxString msgid(data, *inputConv);
+#else // ASCII
+        wxString msgid;

 #if wxUSE_WCHAR_T
 #if wxUSE_WCHAR_T

-        wxString msgid(data, inputConv);
-#else
-        wxString msgid(data);
+        if ( inputConv && sourceConv )
+            msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
+        else

 #endif
 #endif

+            msgid = data;
+#endif // wxUSE_UNICODE

 
         data = StringAtOfs(m_pTransTable, i);
         size_t length = Swap(m_pTransTable[i].nLen);
 
         data = StringAtOfs(m_pTransTable, i);
         size_t length = Swap(m_pTransTable[i].nLen);


@@ -1262,10 +1332,10 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
             wxString msgstr;
 #if wxUSE_WCHAR_T
         #if wxUSE_UNICODE
             wxString msgstr;
 #if wxUSE_WCHAR_T
         #if wxUSE_UNICODE

-            msgstr = wxString(data + offset, inputConv);
+            msgstr = wxString(data + offset, *inputConv);

         #else
         #else

-            if ( convertEncoding )
-                msgstr = wxString(inputConv.cMB2WC(data + offset), wxConvLocal);
+            if ( inputConv )
+                msgstr = wxString(inputConv->cMB2WC(data + offset), wxConvLocal);

             else
                 msgstr = wxString(data + offset);
         #endif
             else
                 msgstr = wxString(data + offset);
         #endif


@@ -1288,6 +1358,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     }
 
 #if wxUSE_WCHAR_T
     }
 
 #if wxUSE_WCHAR_T

+    delete sourceConv;

     delete csConv;
 #endif
 }
     delete csConv;
 #endif
 }


@@ -1298,7 +1369,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
 // ----------------------------------------------------------------------------
 
 bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
 // ----------------------------------------------------------------------------
 
 bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,

-                        bool bConvertEncoding)
+                        const wxChar *msgIdCharset, bool bConvertEncoding)

 {
     wxMsgCatalogFile file;
 
 {
     wxMsgCatalogFile file;
 


@@ -1306,11 +1377,11 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
 
     if ( file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
     {
 
     if ( file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
     {

-        file.FillHash(m_messages, bConvertEncoding);
-        return TRUE;
+        file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
 }
 
 const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const


@@ -1344,7 +1415,7 @@ const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
 
 #include "wx/arrimpl.cpp"
 WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);
 
 #include "wx/arrimpl.cpp"
 WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);

-WX_DEFINE_OBJARRAY(wxLanguageInfoArray);
+WX_DEFINE_OBJARRAY(wxLanguageInfoArray)

 
 wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 
 
 wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 


@@ -1364,9 +1435,12 @@ wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
 }
 
 
 }
 
 

-wxLocale::wxLocale()
+void wxLocale::DoCommonInit()

 {
   m_pszOldLocale = NULL;
 {
   m_pszOldLocale = NULL;

+
+  m_pOldLocale = wxSetLocale(this);
+

   m_pMsgCat = NULL;
   m_language = wxLANGUAGE_UNKNOWN;
   m_initialized = false;
   m_pMsgCat = NULL;
   m_language = wxLANGUAGE_UNKNOWN;
   m_initialized = false;


@@ -1381,7 +1455,7 @@ bool wxLocale::Init(const wxChar *szName,
 {
   wxASSERT_MSG( !m_initialized,
                 _T("you can't call wxLocale::Init more than once") );
 {
   wxASSERT_MSG( !m_initialized,
                 _T("you can't call wxLocale::Init more than once") );

-  
+

   m_initialized = true;
   m_strLocale = szName;
   m_strShort = szShort;
   m_initialized = true;
   m_strLocale = szName;
   m_strShort = szShort;


@@ -1394,7 +1468,7 @@ bool wxLocale::Init(const wxChar *szName,
     // the argument to setlocale()
     szLocale = szShort;
 
     // the argument to setlocale()
     szLocale = szShort;
 

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

   }
 
 #ifdef __WXWINCE__
   }
 
 #ifdef __WXWINCE__


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

-    m_pszOldLocale = wxStrdup(localeName);      
+    m_pszOldLocale = wxStrdup(localeName);

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


@@ -1412,9 +1486,11 @@ 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

-  m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
-  if ( m_pszOldLocale )
-      m_pszOldLocale = wxStrdup(m_pszOldLocale);
+  wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, szLocale);
+  if ( oldLocale )
+      m_pszOldLocale = wxStrdup(oldLocale);
+  else
+      m_pszOldLocale = NULL;

 #endif
 
   if ( m_pszOldLocale == NULL )
 #endif
 
   if ( m_pszOldLocale == NULL )


@@ -1422,7 +1498,7 @@ bool wxLocale::Init(const wxChar *szName,
 
   // the short name will be used to look for catalog files as well,
   // so we need something here
 
   // the short name will be used to look for catalog files as well,
   // so we need something here

-  if ( m_strShort.IsEmpty() ) {
+  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] )
     // FIXME I don't know how these 2 letter abbreviations are formed,
     //       this wild guess is surely wrong
     if ( szLocale && szLocale[0] )


@@ -1433,43 +1509,51 @@ bool wxLocale::Init(const wxChar *szName,
     }
   }
 
     }
   }
 

-  // save the old locale to be able to restore it later
-  m_pOldLocale = wxSetLocale(this);
-
-  // load the default catalog with wxWindows standard messages
+  // load the default catalog with wxWidgets standard messages

   m_pMsgCat = NULL;
   m_pMsgCat = NULL;

-  bool bOk = TRUE;
+  bool bOk = true;

   if ( bLoadDefault )
   if ( bLoadDefault )

+  {

     bOk = AddCatalog(wxT("wxstd"));
 
     bOk = AddCatalog(wxT("wxstd"));
 

+    // there may be a catalog with toolkit specific overrides, it is not
+    // an error if this does not exist
+    if ( bOk && wxTheApp )
+    {
+      wxAppTraits *traits = wxTheApp->GetTraits();
+      if (traits)
+        AddCatalog(traits->GetToolkitInfo().name.BeforeFirst(wxT('/')).MakeLower());
+    }
+  }
+

   return bOk;
 }
 
 
   return bOk;
 }
 
 

-#if defined(__UNIX__) && wxUSE_UNICODE
+#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)

 static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
 {
     wxMB2WXbuf l = wxSetlocale(c, lc);
     if ( !l && lc && lc[0] != 0 )
     {
 static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
 {
     wxMB2WXbuf l = wxSetlocale(c, lc);
     if ( !l && lc && lc[0] != 0 )
     {

-       wxString buf(lc);
+        wxString buf(lc);

         wxString buf2;
         wxString buf2;

-       buf2 = buf + wxT(".UTF-8");
-       l = wxSetlocale(c, buf2.c_str());
+        buf2 = buf + wxT(".UTF-8");
+        l = wxSetlocale(c, buf2.c_str());

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

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

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

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

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

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

         }
     }
     return l;
         }
     }
     return l;


@@ -1490,7 +1574,7 @@ bool wxLocale::Init(int language, int flags)
     // We failed to detect system language, so we will use English:
     if (lang == wxLANGUAGE_UNKNOWN)
     {
     // We failed to detect system language, so we will use English:
     if (lang == wxLANGUAGE_UNKNOWN)
     {

-       return FALSE;
+       return false;

     }
 
     const wxLanguageInfo *info = GetLanguageInfo(lang);
     }
 
     const wxLanguageInfo *info = GetLanguageInfo(lang);


@@ -1499,7 +1583,7 @@ bool wxLocale::Init(int language, int flags)
     if (info == NULL)
     {
         wxLogError(wxT("Unknown language %i."), lang);
     if (info == NULL)
     {
         wxLogError(wxT("Unknown language %i."), lang);

-        return FALSE;
+        return false;

     }
 
     wxString name = info->Description;
     }
 
     wxString name = info->Description;


@@ -1515,6 +1599,18 @@ bool wxLocale::Init(int language, int flags)
 
     wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
 
 
     wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
 

+#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"
+    //
+    // 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(' '));
+    if ( p )
+        *p = _T('\0');
+#endif // __AIX__
+

     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only
     if ( !retloc )
     {
         // Some C libraries don't like xx_YY form and require xx only


@@ -1547,7 +1643,7 @@ bool wxLocale::Init(int language, int flags)
     if ( !retloc )
     {
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
     if ( !retloc )
     {
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());

-        return FALSE;
+        return false;

     }
 #elif defined(__WIN32__)
 
     }
 #elif defined(__WIN32__)
 


@@ -1560,7 +1656,10 @@ bool wxLocale::Init(int language, int flags)
         //     #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS bellow.
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif
         //     #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS bellow.
         #define SETLOCALE_FAILS_ON_UNICODE_LANGS
     #endif

-    
+
+#if !wxUSE_UNICODE
+    const
+#endif

     wxMB2WXbuf retloc = wxT("C");
     if (language != wxLANGUAGE_DEFAULT)
     {
     wxMB2WXbuf retloc = wxT("C");
     if (language != wxLANGUAGE_DEFAULT)
     {


@@ -1571,7 +1670,7 @@ bool wxLocale::Init(int language, int flags)
         }
         else
         {
         }
         else
         {

-            int codepage 
+            int codepage

                          #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
                          = -1
                          #endif
                          #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
                          = -1
                          #endif


@@ -1597,11 +1696,11 @@ bool wxLocale::Init(int language, int flags)
                 if (codepage != 0)
                     locale << wxT(".") << buffer;
             }
                 if (codepage != 0)
                     locale << wxT(".") << buffer;
             }

-            if (locale.IsEmpty())
+            if (locale.empty())

             {
                 wxLogLastError(wxT("SetThreadLocale"));
                 wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
             {
                 wxLogLastError(wxT("SetThreadLocale"));
                 wxLogError(wxT("Cannot set locale to language %s."), name.c_str());

-                return FALSE;
+                return false;

             }
             else
             {
             }
             else
             {


@@ -1643,12 +1742,30 @@ bool wxLocale::Init(int language, int flags)
     if ( !retloc )
     {
         wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
     if ( !retloc )
     {
         wxLogError(wxT("Cannot set locale to language %s."), name.c_str());

-        return FALSE;
+        return false;

     }
     }

-#elif defined(__WXMAC__) || defined(__WXPM__)
+#elif defined(__WXMAC__)
+    if (lang == wxLANGUAGE_DEFAULT)
+        locale = wxEmptyString;
+    else
+        locale = info->CanonicalName;
+
+    wxMB2WXbuf 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 )
+    {
+        wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
+        return false;
+    }
+#elif defined(__WXPM__)

     wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
 #else
     wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
 #else

-    return FALSE;
+    return false;

     #define WX_NO_LOCALE_SUPPORT
 #endif
 
     #define WX_NO_LOCALE_SUPPORT
 #endif
 


@@ -1740,7 +1857,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
          (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
     {
         // 0. Make sure the lang is according to latest ISO 639
          (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
     {
         // 0. Make sure the lang is according to latest ISO 639

-        //    (this is neccessary because glibc uses iw and in instead
+        //    (this is necessary because glibc uses iw and in instead

         //    of he and id respectively).
 
         // the language itself (second part is the dialect/sublang)
         //    of he and id respectively).
 
         // the language itself (second part is the dialect/sublang)


@@ -2134,7 +2251,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
 
 // this is a bit strange as under Windows we get the encoding name using its
 // numeric value and under Unix we do it the other way round, but this just
 
 // this is a bit strange as under Windows we get the encoding name using its
 // numeric value and under Unix we do it the other way round, but this just

-// reflects the way different systems provide he encoding info
+// reflects the way different systems provide the encoding info

 
 /* static */
 wxString wxLocale::GetSystemEncodingName()
 
 /* static */
 wxString wxLocale::GetSystemEncodingName()


@@ -2145,6 +2262,9 @@ wxString wxLocale::GetSystemEncodingName()
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
     encname.Printf(_T("windows-%u"), codepage);

+#elif defined(__WXMAC__)
+    // default is just empty string, this resolves to the default system
+    // encoding later

 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)


@@ -2158,25 +2278,9 @@ wxString wxLocale::GetSystemEncodingName()
 
     if ( alang )
     {
 
     if ( alang )
     {

-        // 7 bit ASCII encoding has several alternative names which we should
-        // recognize to avoid warnings about unrecognized encoding on each
-        // program startup
-
-        // nl_langinfo() under Solaris returns 646 by default which stands for
-        // ISO-646, i.e. 7 bit ASCII
-        //
-        // and recent glibc call it ANSI_X3.4-1968...
-        if ( strcmp(alang, "646") == 0 ||
-               strcmp(alang, "ANSI_X3.4-1968") == 0 )
-        {
-            encname = _T("US-ASCII");
-        }
-        else
-        {
-            encname = wxString::FromAscii( alang );
-        }
+        encname = wxString::FromAscii( alang );

     }
     }

-    else
+    else // nl_langinfo() failed

 #endif // HAVE_LANGINFO_H
     {
         // if we can't get at the character set directly, try to see if it's in
 #endif // HAVE_LANGINFO_H
     {
         // if we can't get at the character set directly, try to see if it's in


@@ -2213,12 +2317,17 @@ wxFontEncoding wxLocale::GetSystemEncoding()
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     UINT codepage = ::GetACP();
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     UINT codepage = ::GetACP();
 

-    // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
+    // wxWidgets only knows about CP1250-1257, 874, 932, 936, 949, 950

     if ( codepage >= 1250 && codepage <= 1257 )
     {
         return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
     }
 
     if ( codepage >= 1250 && codepage <= 1257 )
     {
         return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
     }
 

+    if ( codepage == 874 )
+    {
+        return wxFONTENCODING_CP874;
+    }
+

     if ( codepage == 932 )
     {
         return wxFONTENCODING_CP932;
     if ( codepage == 932 )
     {
         return wxFONTENCODING_CP932;


@@ -2239,18 +2348,23 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)

-    return wxMacGetFontEncFromSystemEnc( CFStringGetSystemEncoding() ) ;
+    TextEncoding encoding = 0 ;
+#if TARGET_CARBON
+    encoding = CFStringGetSystemEncoding() ;
+#else
+    UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
+#endif
+    return wxMacGetFontEncFromSystemEnc( encoding ) ;

 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP

-    wxString encname = GetSystemEncodingName();
+    const wxString encname = GetSystemEncodingName();

     if ( !encname.empty() )
     {
     if ( !encname.empty() )
     {

-        wxFontEncoding enc = wxFontMapper::Get()->
-            CharsetToEncoding(encname, FALSE /* not interactive */);
+        wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname);

 
         // on some modern Linux systems (RedHat 8) the default system locale
         // is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so
         // don't even try to use it in this case
 
         // on some modern Linux systems (RedHat 8) the default system locale
         // is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so
         // don't even try to use it in this case

-#if !wxUSE_UNICODE
+#if !wxUSE_UNICODE && defined(__WXGTK__)

         if ( enc == wxFONTENCODING_UTF8 )
         {
             // the most similar supported encoding...
         if ( enc == wxFONTENCODING_UTF8 )
         {
             // the most similar supported encoding...


@@ -2258,13 +2372,11 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         }
 #endif // !wxUSE_UNICODE
 
         }
 #endif // !wxUSE_UNICODE
 

-        // this should probably be considered as a bug in CharsetToEncoding():
-        // it shouldn't return wxFONTENCODING_DEFAULT at all - but it does it
-        // for US-ASCII charset
-        //
-        // we, OTOH, definitely shouldn't return it as it doesn't make sense at
-        // all (which encoding is it?)
-        if ( enc != wxFONTENCODING_DEFAULT )
+        // GetEncodingFromName() returns wxFONTENCODING_DEFAULT for C locale
+        // (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 )

         {
             return enc;
         }
         {
             return enc;
         }


@@ -2287,6 +2399,11 @@ const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
 {
     CreateLanguagesDB();
 
 {
     CreateLanguagesDB();
 

+    // calling GetLanguageInfo(wxLANGUAGE_DEFAULT) is a natural thing to do, so
+    // make it work
+    if ( lang == wxLANGUAGE_DEFAULT )
+        lang = GetSystemLanguage();
+

     const size_t count = ms_languagesDB->GetCount();
     for ( size_t i = 0; i < count; i++ )
     {
     const size_t count = ms_languagesDB->GetCount();
     for ( size_t i = 0; i < count; i++ )
     {


@@ -2366,8 +2483,9 @@ wxLocale::~wxLocale()
         delete pTmpCat;
     }
 
         delete pTmpCat;
     }
 

-    // restore old locale
+    // restore old locale pointer

     wxSetLocale(m_pOldLocale);
     wxSetLocale(m_pOldLocale);

+

     // FIXME
 #ifndef __WXWINCE__
     wxSetlocale(LC_ALL, m_pszOldLocale);
     // FIXME
 #ifndef __WXWINCE__
     wxSetlocale(LC_ALL, m_pszOldLocale);


@@ -2419,19 +2537,12 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
         {
             NoTransErr noTransErr;
 
         {
             NoTransErr noTransErr;
 

-            if ( szDomain != NULL )
-            {
-                wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%d] not found in domain '%s' for locale '%s'."),
-                           szOrigString, n, szDomain, m_strLocale.c_str());
-
-            }
-            else
-            {
-                wxLogTrace(_T("i18n"),
-                           _T("string '%s'[%d] not found in locale '%s'."),
-                           szOrigString, n, m_strLocale.c_str());
-            }
+            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(""),
+                       m_strLocale.c_str());

         }
 #endif // __WXDEBUG__
 
         }
 #endif // __WXDEBUG__
 


@@ -2444,6 +2555,58 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString,
     return pszTrans;
 }
 
     return pszTrans;
 }
 

+wxString wxLocale::GetHeaderValue( const wxChar* szHeader,
+                                   const wxChar* szDomain ) const
+{
+    if ( wxIsEmpty(szHeader) )
+        return wxEmptyString;
+
+    wxChar const * pszTrans = NULL;
+    wxMsgCatalog *pMsgCat;
+
+    if ( szDomain != NULL )
+    {
+        pMsgCat = FindCatalog(szDomain);
+
+        // does the catalog exist?
+        if ( pMsgCat == NULL )
+            return wxEmptyString;
+
+        pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+    }
+    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
+                break;
+        }
+    }
+
+    if ( wxIsEmpty(pszTrans) )
+      return wxEmptyString;
+
+    wxChar const * pszFound = wxStrstr(pszTrans, szHeader);
+    if ( pszFound == NULL )
+      return wxEmptyString;
+
+    pszFound += wxStrlen(szHeader) + 2 /* ': ' */;
+
+    // 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 );
+
+    return retVal;
+}
+
+

 // find catalog by name in a linked list, return NULL if !found
 wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
 {
 // find catalog by name in a linked list, return NULL if !found
 wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
 {


@@ -2466,27 +2629,47 @@ bool wxLocale::IsLoaded(const wxChar *szDomain) const
 
 // add a catalog to our linked list
 bool wxLocale::AddCatalog(const wxChar *szDomain)
 
 // add a catalog to our linked list
 bool wxLocale::AddCatalog(const wxChar *szDomain)

+{
+    return AddCatalog(szDomain, wxLANGUAGE_ENGLISH, NULL);
+}
+
+// add a catalog to our linked list
+bool wxLocale::AddCatalog(const wxChar *szDomain,
+                          wxLanguage    msgIdLanguage,
+                          const wxChar *msgIdCharset)
+

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

-  if ( pMsgCat->Load(m_strShort, szDomain, m_bConvertEncoding) ) {
+  if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) ) {

     // add it to the head of the list so that in GetString it will
     // be searched before the catalogs added earlier
     pMsgCat->m_pNext = m_pMsgCat;
     m_pMsgCat = pMsgCat;
 
     // add it to the head of the list so that in GetString it will
     // be searched before the catalogs added earlier
     pMsgCat->m_pNext = m_pMsgCat;
     m_pMsgCat = pMsgCat;
 

-    return TRUE;
+    return true;

   }
   else {
     // don't add it because it couldn't be loaded anyway
     delete pMsgCat;
 
   }
   else {
     // don't add it because it couldn't be loaded anyway
     delete pMsgCat;
 

-    // it's OK to not load English catalog, the texts are embedded in
-    // the program:
-    if (m_strShort.Mid(0, 2) == wxT("en"))
-        return TRUE;
+    // It is OK to not load catalog if the msgid language and m_language match,
+    // in which case we can directly display the texts embedded in program's
+    // source code:
+    if (m_language == msgIdLanguage)
+        return true;

 
 

-    return FALSE;
+    // If there's no exact match, we may still get partial match where the
+    // (basic) language is same, but the country differs. For example, it's
+    // permitted to use en_US strings from sources even if m_language is en_GB:
+    const wxLanguageInfo *msgIdLangInfo = GetLanguageInfo(msgIdLanguage);
+    if ( msgIdLangInfo &&
+         msgIdLangInfo->CanonicalName.Mid(0, 2) == m_strShort.Mid(0, 2) )
+    {
+        return true;
+    }
+
+    return false;

   }
 }
 
   }
 }
 


@@ -2494,12 +2677,10 @@ bool wxLocale::AddCatalog(const wxChar *szDomain)
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 

-#if 0
-

 #ifdef __WXMSW__
 
 /* static */
 #ifdef __WXMSW__
 
 /* static */

-wxString wxLocale::GetInfo(wxLocaleInfo index)
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))

 {
     wxString str;
     wxChar buffer[256];
 {
     wxString str;
     wxChar buffer[256];


@@ -2507,29 +2688,31 @@ wxString wxLocale::GetInfo(wxLocaleInfo index)
     buffer[0] = wxT('\0');
     switch (index)
     {
     buffer[0] = wxT('\0');
     switch (index)
     {

-        case wxSYS_DECIMAL_SEPARATOR:
+        case wxLOCALE_DECIMAL_POINT:

             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buffer, 256);
             if (!count)
             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buffer, 256);
             if (!count)

-                str << ".";
+                str << wxT(".");

             else
                 str << buffer;
             break;
             else
                 str << buffer;
             break;

+#if 0

         case wxSYS_LIST_SEPARATOR:
             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, buffer, 256);
             if (!count)
         case wxSYS_LIST_SEPARATOR:
             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, buffer, 256);
             if (!count)

-                str << ",";
+                str << wxT(",");

             else
                 str << buffer;
             break;
         case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, buffer, 256);
             if (!count)
             else
                 str << buffer;
             break;
         case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
             count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, buffer, 256);
             if (!count)

-                str << "0";
+                str << wxT("0");

             else
                 str << buffer;
             break;
             else
                 str << buffer;
             break;

+#endif

         default:
         default:

-            wxFAIL_MSG("Unknown System String !");
+            wxFAIL_MSG(wxT("Unknown System String !"));

     }
     return str;
 }
     }
     return str;
 }


@@ -2537,15 +2720,42 @@ wxString wxLocale::GetInfo(wxLocaleInfo index)
 #else // !__WXMSW__
 
 /* static */
 #else // !__WXMSW__
 
 /* static */

-wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory)
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)

 {
 {

-    return wxEmptyString;
+    struct lconv *locale_info = localeconv();
+    switch (cat)
+    {
+        case wxLOCALE_CAT_NUMBER:
+            switch (index)
+            {
+                case wxLOCALE_THOUSANDS_SEP:
+                    return wxString(locale_info->thousands_sep,
+                                    *wxConvCurrent);
+                case wxLOCALE_DECIMAL_POINT:
+                    return wxString(locale_info->decimal_point,
+                                    *wxConvCurrent);
+                default:
+                    return wxEmptyString;
+            }
+        case wxLOCALE_CAT_MONEY:
+            switch (index)
+            {
+                case wxLOCALE_THOUSANDS_SEP:
+                    return wxString(locale_info->mon_thousands_sep,
+                                    *wxConvCurrent);
+                case wxLOCALE_DECIMAL_POINT:
+                    return wxString(locale_info->mon_decimal_point,
+                                    *wxConvCurrent);
+                default:
+                    return wxEmptyString;
+            }
+        default:
+            return wxEmptyString;
+    }

 }
 
 #endif // __WXMSW__/!__WXMSW__
 
 }
 
 #endif // __WXMSW__/!__WXMSW__
 

-#endif // 0
-

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


@@ -2579,7 +2789,7 @@ class wxLocaleModule: public wxModule
     DECLARE_DYNAMIC_CLASS(wxLocaleModule)
     public:
         wxLocaleModule() {}
     DECLARE_DYNAMIC_CLASS(wxLocaleModule)
     public:
         wxLocaleModule() {}

-        bool OnInit() { return TRUE; }
+        bool OnInit() { return true; }

         void OnExit() { wxLocale::DestroyLanguagesDB(); }
 };
 
         void OnExit() { wxLocale::DestroyLanguagesDB(); }
 };
 


@@ -3141,7 +3351,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_BURMESE,                    "my"   , 0              , 0                                 , "Burmese")
    LNG(wxLANGUAGE_CAMBODIAN,                  "km"   , 0              , 0                                 , "Cambodian")
    LNG(wxLANGUAGE_CATALAN,                    "ca_ES", LANG_CATALAN   , SUBLANG_DEFAULT                   , "Catalan")
    LNG(wxLANGUAGE_BURMESE,                    "my"   , 0              , 0                                 , "Burmese")
    LNG(wxLANGUAGE_CAMBODIAN,                  "km"   , 0              , 0                                 , "Cambodian")
    LNG(wxLANGUAGE_CATALAN,                    "ca_ES", LANG_CATALAN   , SUBLANG_DEFAULT                   , "Catalan")

-   LNG(wxLANGUAGE_CHINESE,                    "zh_CN", LANG_CHINESE   , SUBLANG_DEFAULT                   , "Chinese")
+   LNG(wxLANGUAGE_CHINESE,                    "zh_TW", LANG_CHINESE   , SUBLANG_DEFAULT                   , "Chinese")

    LNG(wxLANGUAGE_CHINESE_SIMPLIFIED,         "zh_CN", LANG_CHINESE   , SUBLANG_CHINESE_SIMPLIFIED        , "Chinese (Simplified)")
    LNG(wxLANGUAGE_CHINESE_TRADITIONAL,        "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , "Chinese (Traditional)")
    LNG(wxLANGUAGE_CHINESE_HONGKONG,           "zh_HK", LANG_CHINESE   , SUBLANG_CHINESE_HONGKONG          , "Chinese (Hongkong)")
    LNG(wxLANGUAGE_CHINESE_SIMPLIFIED,         "zh_CN", LANG_CHINESE   , SUBLANG_CHINESE_SIMPLIFIED        , "Chinese (Simplified)")
    LNG(wxLANGUAGE_CHINESE_TRADITIONAL,        "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , "Chinese (Traditional)")
    LNG(wxLANGUAGE_CHINESE_HONGKONG,           "zh_HK", LANG_CHINESE   , SUBLANG_CHINESE_HONGKONG          , "Chinese (Hongkong)")


@@ -3329,7 +3539,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , "Zhuang")
    LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , "Zulu")
 
    LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , "Zhuang")
    LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , "Zulu")
 

-};
+}

 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---
 #undef LNG
 
 // --- --- --- generated code ends here --- --- ---