document On{Open,Save}Document()

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c03a9824b32a0192e1295c78016b632326ea6d1e..53e36b28921ef0668d545717beacee81114e88ed 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -72,14 +72,10 @@
 #include "wx/hashset.h"
 #include "wx/filesys.h"
 
 #include "wx/hashset.h"
 #include "wx/filesys.h"
 

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

 #if defined(__DARWIN__)
 #if defined(__DARWIN__)

-       #include "wx/mac/corefoundation/cfref.h"
-       #include <CoreFoundation/CFLocale.h>
-       #include "wx/mac/corefoundation/cfstring.h"
+    #include "wx/mac/corefoundation/cfref.h"
+    #include <CoreFoundation/CFLocale.h>
+    #include "wx/mac/corefoundation/cfstring.h"

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


@@ -103,7 +99,7 @@ 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 '_'
 
 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")
+#define TRACE_I18N wxS("i18n")

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


@@ -240,7 +236,7 @@ wxPluralFormsScanner::wxPluralFormsScanner(const char* s) : m_s(s)
 bool wxPluralFormsScanner::nextToken()
 {
     wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;
 bool wxPluralFormsScanner::nextToken()
 {
     wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;

-    while (isspace(*m_s))
+    while (isspace((unsigned char) *m_s))

     {
         ++m_s;
     }
     {
         ++m_s;
     }


@@ -248,20 +244,20 @@ bool wxPluralFormsScanner::nextToken()
     {
         type = wxPluralFormsToken::T_EOF;
     }
     {
         type = wxPluralFormsToken::T_EOF;
     }

-    else if (isdigit(*m_s))
+    else if (isdigit((unsigned char) *m_s))

     {
         wxPluralFormsToken::Number number = *m_s++ - '0';
     {
         wxPluralFormsToken::Number number = *m_s++ - '0';

-        while (isdigit(*m_s))
+        while (isdigit((unsigned char) *m_s))

         {
             number = number * 10 + (*m_s++ - '0');
         }
         m_token.setNumber(number);
         type = wxPluralFormsToken::T_NUMBER;
     }
         {
             number = number * 10 + (*m_s++ - '0');
         }
         m_token.setNumber(number);
         type = wxPluralFormsToken::T_NUMBER;
     }

-    else if (isalpha(*m_s))
+    else if (isalpha((unsigned char) *m_s))

     {
         const char* begin = m_s++;
     {
         const char* begin = m_s++;

-        while (isalnum(*m_s))
+        while (isalnum((unsigned char) *m_s))

         {
             ++m_s;
         }
         {
             ++m_s;
         }


@@ -970,8 +966,10 @@ private:
 class wxMsgCatalog
 {
 public:
 class wxMsgCatalog
 {
 public:

+#if !wxUSE_UNICODE

     wxMsgCatalog() { m_conv = NULL; }
     ~wxMsgCatalog();
     wxMsgCatalog() { m_conv = NULL; }
     ~wxMsgCatalog();

+#endif

 
     // load the catalog from disk (szDirPrefix corresponds to language)
     bool Load(const wxString& dirPrefix, const wxString& name,
 
     // load the catalog from disk (szDirPrefix corresponds to language)
     bool Load(const wxString& dirPrefix, const wxString& name,


@@ -990,9 +988,11 @@ private:
     wxMessagesHash  m_messages; // all messages in the catalog
     wxString        m_name;     // name of the domain
 
     wxMessagesHash  m_messages; // all messages in the catalog
     wxString        m_name;     // name of the domain
 

+#if !wxUSE_UNICODE

     // the conversion corresponding to this catalog charset if we installed it
     // as the global one
     wxCSConv *m_conv;
     // the conversion corresponding to this catalog charset if we installed it
     // as the global one
     wxCSConv *m_conv;

+#endif

 
     wxPluralFormsCalculatorPtr  m_pluralFormsCalculator;
 };
 
     wxPluralFormsCalculatorPtr  m_pluralFormsCalculator;
 };


@@ -1008,6 +1008,68 @@ static wxArrayString gs_searchPrefixes;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// wxLanguageInfo
+// ----------------------------------------------------------------------------
+
+#ifdef __WXMSW__
+
+// helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine
+// whether the locale is Unicode-only (it is if this function returns empty
+// string)
+static wxString wxGetANSICodePageForLocale(LCID lcid)
+{
+    wxString cp;
+
+    wxChar buffer[16];
+    if ( ::GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE,
+                         buffer, WXSIZEOF(buffer)) > 0 )
+    {
+        if ( buffer[0] != _T('0') || buffer[1] != _T('\0') )
+            cp = buffer;
+        //else: this locale doesn't use ANSI code page
+    }
+
+    return cp;
+}
+
+wxUint32 wxLanguageInfo::GetLCID() const
+{
+    return MAKELCID(MAKELANGID(WinLang, WinSublang), SORT_DEFAULT);
+}
+
+wxString wxLanguageInfo::GetLocaleName() const
+{
+    wxString locale;
+
+    const LCID lcid = GetLCID();
+
+    wxChar buffer[256];
+    buffer[0] = _T('\0');
+    if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) )
+    {
+        wxLogLastError(_T("GetLocaleInfo(LOCALE_SENGLANGUAGE)"));
+        return locale;
+    }
+
+    locale << buffer;
+    if ( ::GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY,
+                         buffer, WXSIZEOF(buffer)) > 0 )
+    {
+        locale << _T('_') << buffer;
+    }
+
+    const wxString cp = wxGetANSICodePageForLocale(lcid);
+    if ( !cp.empty() )
+    {
+        locale << _T('.') << cp;
+    }
+
+    return locale;
+}
+
+#endif // __WXMSW__
+

 // ----------------------------------------------------------------------------
 // wxMsgCatalogFile class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMsgCatalogFile class
 // ----------------------------------------------------------------------------


@@ -1074,7 +1136,7 @@ static wxString GetFullSearchPath(const wxString& lang)
 #ifdef __UNIX__
     // LC_PATH is a standard env var containing the search path for the .mo
     // files
 #ifdef __UNIX__
     // LC_PATH is a standard env var containing the search path for the .mo
     // files

-    const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
+    const char *pszLcPath = wxGetenv("LC_PATH");

     if ( pszLcPath )
     {
         const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
     if ( pszLcPath )
     {
         const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);


@@ -1086,7 +1148,7 @@ static wxString GetFullSearchPath(const wxString& lang)
     wxString wxp = wxGetInstallPrefix();
     if ( !wxp.empty() )
     {
     wxString wxp = wxGetInstallPrefix();
     if ( !wxp.empty() )
     {

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

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


@@ -1122,14 +1184,14 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
   if ( encSys != wxFONTENCODING_SYSTEM )
   {
     wxString fullname(szDirPrefix);
   if ( encSys != wxFONTENCODING_SYSTEM )
   {
     wxString fullname(szDirPrefix);

-    fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys);
+    fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys);

     searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
   }
 #endif // wxUSE_FONTMAP
 
 
   searchPath += GetFullSearchPath(szDirPrefix);
     searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
   }
 #endif // wxUSE_FONTMAP
 
 
   searchPath += GetFullSearchPath(szDirPrefix);

-  size_t sublocaleIndex = szDirPrefix.find(wxT('_'));
+  size_t sublocaleIndex = szDirPrefix.find(wxS('_'));

   if ( sublocaleIndex != wxString::npos )
   {
       // also add just base locale name: for things like "fr_BE" (belgium
   if ( sublocaleIndex != wxString::npos )
   {
       // also add just base locale name: for things like "fr_BE" (belgium


@@ -1147,11 +1209,11 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
   NoTransErr noTransErr;
   wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
                szName, searchPath.c_str());
   NoTransErr noTransErr;
   wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
                szName, searchPath.c_str());

-  wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""),
+  wxLogTrace(TRACE_I18N, wxS("Looking for \"%s.mo\" in \"%s\""),

              szName, searchPath.c_str());
 
   wxFileName fn(szName);
              szName, searchPath.c_str());
 
   wxFileName fn(szName);

-  fn.SetExt(_T("mo"));
+  fn.SetExt(wxS("mo"));

 
   wxString strFullName;
 #if wxUSE_FILESYSTEM
 
   wxString strFullName;
 #if wxUSE_FILESYSTEM


@@ -1162,13 +1224,13 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
 #endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
   {
     wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
 #endif // wxUSE_FILESYSTEM/!wxUSE_FILESYSTEM
   {
     wxLogVerbose(_("catalog file for domain '%s' not found."), szName);

-    wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
+    wxLogTrace(TRACE_I18N, wxS("Catalog \"%s.mo\" not found"), szName);

     return false;
   }
 
   // open file and read its data
   wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
     return false;
   }
 
   // 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());
+  wxLogTrace(TRACE_I18N, wxS("Using catalog \"%s\"."), strFullName.c_str());

 
 #if wxUSE_FILESYSTEM
   wxFSFile * const fileMsg = fileSys.OpenFile(strFullName);
 
 #if wxUSE_FILESYSTEM
   wxFSFile * const fileMsg = fileSys.OpenFile(strFullName);


@@ -1196,7 +1258,7 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
     return false;
 
   size_t nSize = wx_truncate_cast(size_t, lenFile);
     return false;
 
   size_t nSize = wx_truncate_cast(size_t, lenFile);

-  wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
+  wxASSERT_MSG( nSize == lenFile + size_t(0), wxS("message catalog bigger than 4GB?") );

 
   // read the whole file in memory
   if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )
 
   // read the whole file in memory
   if ( fileMsg.Read(m_data.GetWriteBuf(nSize), nSize) != lenFile )


@@ -1238,7 +1300,7 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
   {
       // Extract the charset:
       wxString header = wxString::FromAscii(StringAtOfs(m_pTransTable, 0));
   {
       // Extract the charset:
       wxString header = wxString::FromAscii(StringAtOfs(m_pTransTable, 0));

-      int begin = header.Find(wxT("Content-Type: text/plain; charset="));
+      int begin = header.Find(wxS("Content-Type: text/plain; charset="));

       if (begin != wxNOT_FOUND)
       {
           begin += 34; //strlen("Content-Type: text/plain; charset=")
       if (begin != wxNOT_FOUND)
       {
           begin += 34; //strlen("Content-Type: text/plain; charset=")


@@ -1246,7 +1308,7 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
           if (end != size_t(-1))
           {
               m_charset.assign(header, begin, end - begin);
           if (end != size_t(-1))
           {
               m_charset.assign(header, begin, end - begin);

-              if (m_charset == wxT("CHARSET"))
+              if (m_charset == wxS("CHARSET"))

               {
                   // "CHARSET" is not valid charset, but lazy translator
                   m_charset.Clear();
               {
                   // "CHARSET" is not valid charset, but lazy translator
                   m_charset.Clear();


@@ -1256,7 +1318,7 @@ bool wxMsgCatalogFile::Load(const wxString& szDirPrefix, const wxString& szName,
       // else: incorrectly filled Content-Type header
 
       // Extract plural forms:
       // else: incorrectly filled Content-Type header
 
       // Extract plural forms:

-      begin = header.Find(wxT("Plural-Forms:"));
+      begin = header.Find(wxS("Plural-Forms:"));

       if (begin != wxNOT_FOUND)
       {
           begin += 13;
       if (begin != wxNOT_FOUND)
       {
           begin += 13;


@@ -1336,7 +1398,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 
 #elif wxUSE_FONTMAP
     wxASSERT_MSG( msgIdCharset.empty(),
 
 #elif wxUSE_FONTMAP
     wxASSERT_MSG( msgIdCharset.empty(),

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

 
     wxEncodingConverter converter;
     if ( convertEncoding )
 
     wxEncodingConverter converter;
     if ( convertEncoding )


@@ -1434,6 +1496,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 // wxMsgCatalog class
 // ----------------------------------------------------------------------------
 
 // wxMsgCatalog class
 // ----------------------------------------------------------------------------
 

+#if !wxUSE_UNICODE

 wxMsgCatalog::~wxMsgCatalog()
 {
     if ( m_conv )
 wxMsgCatalog::~wxMsgCatalog()
 {
     if ( m_conv )


@@ -1448,6 +1511,7 @@ wxMsgCatalog::~wxMsgCatalog()
         delete m_conv;
     }
 }
         delete m_conv;
     }
 }

+#endif // !wxUSE_UNICODE

 
 bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
                         const wxString& msgIdCharset, bool bConvertEncoding)
 
 bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
                         const wxString& msgIdCharset, bool bConvertEncoding)


@@ -1461,6 +1525,7 @@ bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
 
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
 

+#if !wxUSE_UNICODE

     // we should use a conversion compatible with the message catalog encoding
     // in the GUI if we don't convert the strings to the current conversion but
     // as the encoding is global, only change it once, otherwise we could get
     // we should use a conversion compatible with the message catalog encoding
     // in the GUI if we don't convert the strings to the current conversion but
     // as the encoding is global, only change it once, otherwise we could get


@@ -1476,6 +1541,7 @@ bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
         wxConvUI =
         m_conv = new wxCSConv(file.GetCharset());
     }
         wxConvUI =
         m_conv = new wxCSConv(file.GetCharset());
     }

+#endif // !wxUSE_UNICODE

 
     return true;
 }
 
     return true;
 }


@@ -1550,7 +1616,7 @@ bool wxLocale::Init(const wxString& name,
                     bool            bConvertEncoding)
 {
   wxASSERT_MSG( !m_initialized,
                     bool            bConvertEncoding)
 {
   wxASSERT_MSG( !m_initialized,

-                _T("you can't call wxLocale::Init more than once") );
+                wxS("you can't call wxLocale::Init more than once") );

 
   m_initialized = true;
   m_strLocale = name;
 
   m_initialized = true;
   m_strLocale = name;


@@ -1566,30 +1632,14 @@ bool wxLocale::Init(const wxString& name,
     szLocale = shortName;
 
     wxCHECK_MSG( !szLocale.empty(), false,
     szLocale = shortName;
 
     wxCHECK_MSG( !szLocale.empty(), false,

-                 _T("no locale to set in wxLocale::Init()") );
+                 wxS("no locale to set in wxLocale::Init()") );

   }
 
   }
 

-#ifdef __WXWINCE__
-  // FIXME: I'm guessing here
-  wxChar localeName[256];
-  int ret = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLANGUAGE, localeName,
-      256);
-  if (ret != 0)
-  {
-    m_pszOldLocale = wxStrdup(wxConvLibc.cWC2MB(localeName));
-  }
-  else
-    m_pszOldLocale = NULL;
-
-  // TODO: how to find languageId
-  // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
-#else

   const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else
       m_pszOldLocale = NULL;
   const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( oldLocale )
       m_pszOldLocale = wxStrdup(oldLocale);
   else
       m_pszOldLocale = NULL;

-#endif

 
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);
 
   if ( m_pszOldLocale == NULL )
     wxLogError(_("locale '%s' can not be set."), szLocale);


@@ -1612,7 +1662,7 @@ bool wxLocale::Init(const wxString& name,
   bool bOk = true;
   if ( bLoadDefault )
   {
   bool bOk = true;
   if ( bLoadDefault )
   {

-    bOk = AddCatalog(wxT("wxstd"));
+    bOk = AddCatalog(wxS("wxstd"));

 
     // there may be a catalog with toolkit specific overrides, it is not
     // an error if this does not exist
 
     // there may be a catalog with toolkit specific overrides, it is not
     // an error if this does not exist


@@ -1621,7 +1671,7 @@ bool wxLocale::Init(const wxString& name,
       wxString port(wxPlatformInfo::Get().GetPortIdName());
       if ( !port.empty() )
       {
       wxString port(wxPlatformInfo::Get().GetPortIdName());
       if ( !port.empty() )
       {

-        AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());
+        AddCatalog(port.BeforeFirst(wxS('/')).MakeLower());

       }
     }
   }
       }
     }
   }


@@ -1642,21 +1692,21 @@ static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
     {
         wxString buf(lc);
         wxString buf2;
     {
         wxString buf(lc);
         wxString buf2;

-        buf2 = buf + wxT(".UTF-8");
+        buf2 = buf + wxS(".UTF-8");

         l = wxSetlocale(c, buf2);
         if ( !l )
         {
         l = wxSetlocale(c, buf2);
         if ( !l )
         {

-            buf2 = buf + wxT(".utf-8");
+            buf2 = buf + wxS(".utf-8");

             l = wxSetlocale(c, buf2);
         }
         if ( !l )
         {
             l = wxSetlocale(c, buf2);
         }
         if ( !l )
         {

-            buf2 = buf + wxT(".UTF8");
+            buf2 = buf + wxS(".UTF8");

             l = wxSetlocale(c, buf2);
         }
         if ( !l )
         {
             l = wxSetlocale(c, buf2);
         }
         if ( !l )
         {

-            buf2 = buf + wxT(".utf8");
+            buf2 = buf + wxS(".utf8");

             l = wxSetlocale(c, buf2);
         }
     }
             l = wxSetlocale(c, buf2);
         }
     }


@@ -1693,7 +1743,7 @@ bool wxLocale::Init(int language, int flags)
     // Unknown language:
     if (info == NULL)
     {
     // Unknown language:
     if (info == NULL)
     {

-        wxLogError(wxT("Unknown language %i."), lang);
+        wxLogError(wxS("Unknown language %i."), lang);

         return false;
     }
 
         return false;
     }
 


@@ -1730,7 +1780,7 @@ bool wxLocale::Init(int language, int flags)
             wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
         while ( *names )
         {
             wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
         while ( *names )
         {

-            retloc = wxSetlocale(LC_ALL, locale + _T('.') + *names++);
+            retloc = wxSetlocale(LC_ALL, locale + wxS('.') + *names++);

             if ( retloc )
                 break;
         }
             if ( retloc )
                 break;
         }


@@ -1742,16 +1792,16 @@ bool wxLocale::Init(int language, int flags)
         // Some C libraries (namely glibc) still use old ISO 639,
         // so will translate the abbrev for them
         wxString localeAlt;
         // Some C libraries (namely glibc) still use old ISO 639,
         // so will translate the abbrev for them
         wxString localeAlt;

-        if ( langOnly == wxT("he") )
-            localeAlt = wxT("iw") + locale.Mid(3);
-        else if ( langOnly == wxT("id") )
-            localeAlt = wxT("in") + locale.Mid(3);
-        else if ( langOnly == wxT("yi") )
-            localeAlt = wxT("ji") + locale.Mid(3);
-        else if ( langOnly == wxT("nb") )
-            localeAlt = wxT("no_NO");
-        else if ( langOnly == wxT("nn") )
-            localeAlt = wxT("no_NY");
+        if ( langOnly == wxS("he") )
+            localeAlt = wxS("iw") + locale.Mid(3);
+        else if ( langOnly == wxS("id") )
+            localeAlt = wxS("in") + locale.Mid(3);
+        else if ( langOnly == wxS("yi") )
+            localeAlt = wxS("ji") + locale.Mid(3);
+        else if ( langOnly == wxS("nb") )
+            localeAlt = wxS("no_NO");
+        else if ( langOnly == wxS("nn") )
+            localeAlt = wxS("no_NY");

 
         if ( !localeAlt.empty() )
         {
 
         if ( !localeAlt.empty() )
         {


@@ -1778,94 +1828,57 @@ bool wxLocale::Init(int language, int flags)
 #endif // __AIX__
 
 #elif defined(__WIN32__)
 #endif // __AIX__
 
 #elif defined(__WIN32__)

-
-    #if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
-        // NB: setlocale() from msvcrt.dll (used by VC++ and Mingw)
-        //     can't set locale to language that can only be written using
-        //     Unicode.  Therefore wxSetlocale call failed, but we don't want
-        //     to report it as an error -- so that at least message catalogs
-        //     can be used. Watch for code marked with
-        //     #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS bellow.
-        #define SETLOCALE_FAILS_ON_UNICODE_LANGS
-    #endif
-

     const char *retloc = "C";
     const char *retloc = "C";

-    if (language != wxLANGUAGE_DEFAULT)
+    if ( language != wxLANGUAGE_DEFAULT )

     {
     {

-        if (info->WinLang == 0)
+        if ( info->WinLang == 0 )

         {
         {

-            wxLogWarning(wxT("Locale '%s' not supported by OS."), name.c_str());
+            wxLogWarning(wxS("Locale '%s' not supported by OS."), name.c_str());

             // retloc already set to "C"
         }
             // retloc already set to "C"
         }

-        else
+        else // language supported by Windows

         {
         {

-            int codepage
-                         #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
-                         = -1
-                         #endif
-                         ;
-            wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
-                                     SORT_DEFAULT);
-            // FIXME
+            // Windows CE doesn't have SetThreadLocale() and there doesn't seem
+            // to be any equivalent

 #ifndef __WXWINCE__
 #ifndef __WXWINCE__

-            SetThreadLocale(lcid);
-#endif
-            // NB: we must translate LCID to CRT's setlocale string ourselves,
-            //     because SetThreadLocale does not modify change the
-            //     interpretation of setlocale(LC_ALL, "") call:
-            wxChar buffer[256];
-            buffer[0] = wxT('\0');
-            GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, 256);
-            locale << buffer;
-            if (GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, buffer, 256) > 0)
-                locale << wxT("_") << buffer;
-            if (GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE, buffer, 256) > 0)
-            {
-                codepage = wxAtoi(buffer);
-                if (codepage != 0)
-                    locale << wxT(".") << buffer;
-            }
-            if (locale.empty())
+            const wxUint32 lcid = info->GetLCID();
+
+            // change locale used by Windows functions
+            ::SetThreadLocale(lcid);
+#endif
+
+            // and also call setlocale() to change locale used by the CRT
+            locale = info->GetLocaleName();
+            if ( locale.empty() )

             {
             {

-                wxLogLastError(wxT("SetThreadLocale"));

                 ret = false;
             }
                 ret = false;
             }

-            else
+            else // have a valid locale

             {
             {

-            // FIXME
-#ifndef __WXWINCE__

                 retloc = wxSetlocale(LC_ALL, locale);
                 retloc = wxSetlocale(LC_ALL, locale);

-#endif
-#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
-                if (codepage == 0 && retloc == NULL)
-                {
-                    retloc = "C";
-                }
-#endif

             }
         }
     }
             }
         }
     }

-    else
+    else // language == wxLANGUAGE_DEFAULT

     {
     {

-            // FIXME
-#ifndef __WXWINCE__

         retloc = wxSetlocale(LC_ALL, wxEmptyString);
         retloc = wxSetlocale(LC_ALL, wxEmptyString);

-#else
-        retloc = NULL;
-#endif
-#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
-        if (retloc == NULL)
+    }
+
+#if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
+    // VC++ setlocale() (also used by Mingw) can't set locale to languages that
+    // can only be written using Unicode, therefore wxSetlocale() call fails
+    // for such languages but we don't want to report it as an error -- so that
+    // at least message catalogs can be used.
+    if ( !retloc )
+    {
+        if ( wxGetANSICodePageForLocale(LOCALE_USER_DEFAULT).empty() )

         {
         {

-            wxChar buffer[16];
-            if (GetLocaleInfo(LOCALE_USER_DEFAULT,
-                              LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
-                 wxStrcmp(buffer, wxT("0")) == 0)
-            {
-                retloc = "C";
-            }
+            // we set the locale to a Unicode-only language, don't treat the
+            // inability of CRT to use it as an error
+            retloc = "C";

         }
         }

-#endif

     }
     }

+#endif // CRT not handling Unicode-only languages

 
     if ( !retloc )
         ret = false;
 
     if ( !retloc )
         ret = false;


@@ -1934,26 +1947,25 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     // first get the string identifying the language from the environment
     wxString langFull;
 #ifdef __WXMAC__
     // first get the string identifying the language from the environment
     wxString langFull;
 #ifdef __WXMAC__

-    // as at the C-runtime level many OS X versions only have a "C" locale, therefore we use the CFLocale (ICU based)

     wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
     wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());

-    
-    // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg 
+
+    // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg

     // az_Cyrl_AZ@calendar=buddhist;currency=JPY we just recreate the base info as expected by wx here
     // az_Cyrl_AZ@calendar=buddhist;currency=JPY we just recreate the base info as expected by wx here

-    
-    wxMacCFStringHolder str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode)));
+
+    wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode)));

     langFull = str.AsString()+"_";
     langFull = str.AsString()+"_";

-    str.Assign(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));
+    str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));

     langFull += str.AsString();
 #else
     langFull += str.AsString();
 #else

-    if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
-        !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
-        !wxGetEnv(wxT("LANG"), &langFull))
+    if (!wxGetEnv(wxS("LC_ALL"), &langFull) &&
+        !wxGetEnv(wxS("LC_MESSAGES"), &langFull) &&
+        !wxGetEnv(wxS("LANG"), &langFull))

     {
         // no language specified, treat it as English
         return wxLANGUAGE_ENGLISH_US;
     }
 
     {
         // no language specified, treat it as English
         return wxLANGUAGE_ENGLISH_US;
     }
 

-    if ( langFull == _T("C") || langFull == _T("POSIX") )
+    if ( langFull == wxS("C") || langFull == wxS("POSIX") )

     {
         // default C locale is English too
         return wxLANGUAGE_ENGLISH_US;
     {
         // default C locale is English too
         return wxLANGUAGE_ENGLISH_US;


@@ -1980,9 +1992,14 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     // for now we don't use the encoding, although we probably should (doing
     // translations of the msg catalogs on the fly as required) (TODO)
     //
     // for now we don't use the encoding, although we probably should (doing
     // translations of the msg catalogs on the fly as required) (TODO)
     //

-    // we don't use the modifiers neither but we probably should translate
-    // "euro" into iso885915
-    size_t posEndLang = langFull.find_first_of(_T("@."));
+    // we need the modified for languages like Valencian: ca_ES@valencia
+    // though, remember it
+    wxString modifier;
+    size_t posModifier = langFull.find_first_of(wxS("@"));
+    if ( posModifier != wxString::npos )
+        modifier = langFull.Mid(posModifier);
+
+    size_t posEndLang = langFull.find_first_of(wxS("@."));

     if ( posEndLang != wxString::npos )
     {
         langFull.Truncate(posEndLang);
     if ( posEndLang != wxString::npos )
     {
         langFull.Truncate(posEndLang);


@@ -1995,7 +2012,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     // do we have just the language (or sublang too)?
     bool justLang = langFull.length() == LEN_LANG;
     if ( justLang ||
     // do we have just the language (or sublang too)?
     bool justLang = langFull.length() == LEN_LANG;
     if ( justLang ||

-         (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
+         (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxS('_')) )

     {
         // 0. Make sure the lang is according to latest ISO 639
         //    (this is necessary because glibc uses iw and in instead
     {
         // 0. Make sure the lang is according to latest ISO 639
         //    (this is necessary because glibc uses iw and in instead


@@ -2005,18 +2022,18 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         wxString langOrig = ExtractLang(langFull);
 
         wxString lang;
         wxString langOrig = ExtractLang(langFull);
 
         wxString lang;

-        if ( langOrig == wxT("iw"))
-            lang = _T("he");
-        else if (langOrig == wxT("in"))
-            lang = wxT("id");
-        else if (langOrig == wxT("ji"))
-            lang = wxT("yi");
-        else if (langOrig == wxT("no_NO"))
-            lang = wxT("nb_NO");
-        else if (langOrig == wxT("no_NY"))
-            lang = wxT("nn_NO");
-        else if (langOrig == wxT("no"))
-            lang = wxT("nb_NO");
+        if ( langOrig == wxS("iw"))
+            lang = wxS("he");
+        else if (langOrig == wxS("in"))
+            lang = wxS("id");
+        else if (langOrig == wxS("ji"))
+            lang = wxS("yi");
+        else if (langOrig == wxS("no_NO"))
+            lang = wxS("nb_NO");
+        else if (langOrig == wxS("no_NY"))
+            lang = wxS("nn_NO");
+        else if (langOrig == wxS("no"))
+            lang = wxS("nb_NO");

         else
             lang = langOrig;
 
         else
             lang = langOrig;
 


@@ -2027,11 +2044,24 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
         }
 
         // 1. Try to find the language either as is:
         }
 
         // 1. Try to find the language either as is:

-        for ( i = 0; i < count; i++ )
+        // a) With modifier if set
+        if ( !modifier.empty() )

         {
         {

-            if ( ms_languagesDB->Item(i).CanonicalName == langFull )
+            wxString langFullWithModifier = langFull + modifier;
+            for ( i = 0; i < count; i++ )

             {
             {

-                break;
+                if ( ms_languagesDB->Item(i).CanonicalName == langFullWithModifier )
+                    break;
+            }
+        }
+
+        // b) Without modifier
+        if ( modifier.empty() || i == count )
+        {
+            for ( i = 0; i < count; i++ )
+            {
+                if ( ms_languagesDB->Item(i).CanonicalName == langFull )
+                    break;

             }
         }
 
             }
         }
 


@@ -2116,7 +2146,7 @@ wxString wxLocale::GetSystemEncodingName()
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();

-    encname.Printf(_T("windows-%u"), codepage);
+    encname.Printf(wxS("windows-%u"), codepage);

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


@@ -2203,7 +2233,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)
         return wxFONTENCODING_CP950;
     }
 #elif defined(__WXMAC__)

-    TextEncoding encoding = 0 ;
+    CFStringEncoding encoding = 0 ;

     encoding = CFStringGetSystemEncoding() ;
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
     encoding = CFStringGetSystemEncoding() ;
     return wxMacGetFontEncFromSystemEnc( encoding ) ;
 #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP


@@ -2306,7 +2336,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
             break;
         }
 
             break;
         }
 

-        if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(_T('_'))) == 0 )
+        if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(wxS('_'))) == 0 )

         {
             // a match -- but maybe we'll find an exact one later, so continue
             // looking
         {
             // a match -- but maybe we'll find an exact one later, so continue
             // looking


@@ -2324,12 +2354,7 @@ const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
 
 wxString wxLocale::GetSysName() const
 {
 
 wxString wxLocale::GetSysName() const
 {

-            // FIXME
-#ifndef __WXWINCE__

     return wxSetlocale(LC_ALL, NULL);
     return wxSetlocale(LC_ALL, NULL);

-#else
-    return wxEmptyString;
-#endif

 }
 
 // clean up
 }
 
 // clean up


@@ -2346,10 +2371,7 @@ wxLocale::~wxLocale()
     // restore old locale pointer
     wxSetLocale(m_pOldLocale);
 
     // restore old locale pointer
     wxSetLocale(m_pOldLocale);
 

-    // FIXME
-#ifndef __WXWINCE__

     wxSetlocale(LC_ALL, m_pszOldLocale);
     wxSetlocale(LC_ALL, m_pszOldLocale);

-#endif

     free((wxChar *)m_pszOldLocale);     // const_cast
 }
 
     free((wxChar *)m_pszOldLocale);     // const_cast
 }
 


@@ -2398,11 +2420,9 @@ const wxString& wxLocale::GetString(const wxString& origString,
             NoTransErr noTransErr;
 
             wxLogTrace(TRACE_I18N,
             NoTransErr noTransErr;
 
             wxLogTrace(TRACE_I18N,

-                       _T("string \"%s\"[%ld] not found in %slocale '%s'."),
+                       wxS("string \"%s\"[%ld] not found in %slocale '%s'."),

                        origString, (long)n,
                        origString, (long)n,

-                       domain.empty()
-                         ? (const wxChar*)wxString::Format(_T("domain '%s' "), domain).c_str()
-                         : _T(""),
+                       wxString::Format(wxS("domain '%s' "), domain).c_str(),

                        m_strLocale.c_str());
         }
 #endif // __WXDEBUG__
                        m_strLocale.c_str());
         }
 #endif // __WXDEBUG__


@@ -2472,7 +2492,7 @@ wxString wxLocale::GetHeaderValue(const wxString& header,
 
     // Every header is separated by \n
 
 
     // Every header is separated by \n
 

-    size_t endLine = trans->find(wxT('\n'), found);
+    size_t endLine = trans->find(wxS('\n'), found);

     size_t len = (endLine == wxString::npos) ?
                  wxString::npos : (endLine - found);
 
     size_t len = (endLine == wxString::npos) ?
                  wxString::npos : (endLine - found);
 


@@ -2499,18 +2519,13 @@ wxMsgCatalog *wxLocale::FindCatalog(const wxString& domain) const
 bool wxLocale::IsAvailable(int lang)
 {
     const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
 bool wxLocale::IsAvailable(int lang)
 {
     const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);

-    wxCHECK_MSG( info, false, _T("invalid language") );
+    wxCHECK_MSG( info, false, wxS("invalid language") );

 
 #if defined(__WIN32__)
     if ( !info->WinLang )
         return false;
 
 
 #if defined(__WIN32__)
     if ( !info->WinLang )
         return false;
 

-    if ( !::IsValidLocale
-            (
-                MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
-                         SORT_DEFAULT),
-                LCID_INSTALLED
-            ) )
+    if ( !::IsValidLocale(info->GetLCID(), LCID_INSTALLED) )

         return false;
 
 #elif defined(__UNIX__)
         return false;
 
 #elif defined(__UNIX__)


@@ -2593,37 +2608,46 @@ bool wxLocale::AddCatalog(const wxString& szDomain,
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 {
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 {

+    wxUint32 lcid = LOCALE_USER_DEFAULT;
+
+    if (wxGetLocale())
+    {
+        const wxLanguageInfo *info = GetLanguageInfo(wxGetLocale()->GetLanguage());
+        if ( info )
+            lcid = info->GetLCID();
+    }
+

     wxString str;
     wxChar buffer[256];
     size_t count;
     wxString str;
     wxChar buffer[256];
     size_t count;

-    buffer[0] = wxT('\0');
+    buffer[0] = wxS('\0');

     switch (index)
     {
         case wxLOCALE_DECIMAL_POINT:
     switch (index)
     {
         case wxLOCALE_DECIMAL_POINT:

-            count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buffer, 256);
+            count = ::GetLocaleInfo(lcid, LOCALE_SDECIMAL, buffer, 256);

             if (!count)
             if (!count)

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

             else
                 str << buffer;
             break;
 #if 0
         case wxSYS_LIST_SEPARATOR:
             else
                 str << buffer;
             break;
 #if 0
         case wxSYS_LIST_SEPARATOR:

-            count = ::GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, buffer, 256);
+            count = ::GetLocaleInfo(lcid, LOCALE_SLIST, buffer, 256);

             if (!count)
             if (!count)

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

             else
                 str << buffer;
             break;
         case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
             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);
+            count = ::GetLocaleInfo(lcid, LOCALE_ILZERO, buffer, 256);

             if (!count)
             if (!count)

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

             else
                 str << buffer;
             break;
 #endif
         default:
             else
                 str << buffer;
             break;
 #endif
         default:

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

     }
     return str;
 }
     }
     return str;
 }


@@ -2633,24 +2657,40 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 {
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 {

-    wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
-    CFTypeRef cfstr;
+    CFLocaleRef userLocaleRefRaw;
+    if ( wxGetLocale() )
+    {
+        userLocaleRefRaw = CFLocaleCreate
+                           (
+                                kCFAllocatorDefault,
+                                wxCFStringRef(wxGetLocale()->GetCanonicalName())
+                           );
+    }
+    else // no current locale, use the default one
+    {
+        userLocaleRefRaw = CFLocaleCopyCurrent();
+    }
+
+    wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
+
+    CFStringRef cfstr = 0;

     switch ( index )
     {
         case wxLOCALE_THOUSANDS_SEP:
     switch ( index )
     {
         case wxLOCALE_THOUSANDS_SEP:

-            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);

             break;
 
         case wxLOCALE_DECIMAL_POINT:
             break;
 
         case wxLOCALE_DECIMAL_POINT:

-            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);

             break;
 
         default:
             wxFAIL_MSG( "Unknown locale info" );
             break;
 
         default:
             wxFAIL_MSG( "Unknown locale info" );

+            cfstr = CFSTR("");
+            break;

     }
 
     }
 

-    wxMacCFStringHolder
-        str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+    wxCFStringRef str(wxCFRetain(cfstr));

     return str.AsString();
 }
 
     return str.AsString();
 }
 


@@ -3237,9 +3277,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
 
 #define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
     info.Language = wxlang;                               \
 
 #define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
     info.Language = wxlang;                               \

-    info.CanonicalName = wxT(canonical);                  \
+    info.CanonicalName = wxS(canonical);                  \

     info.LayoutDirection = layout;                        \
     info.LayoutDirection = layout;                        \

-    info.Description = wxT(desc);                         \
+    info.Description = wxS(desc);                         \

     SETWINLANG(info, winlang, winsublang)                 \
     AddLanguage(info);
 
     SETWINLANG(info, winlang, winsublang)                 \
     AddLanguage(info);
 


@@ -3332,7 +3372,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
    LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
    LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")
    LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
    LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
    LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")

-   LNG(wxLANGUAGE_GEORGIAN,                   "ka"   , LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
+   LNG(wxLANGUAGE_GEORGIAN,                   "ka_GE", LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")

    LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
    LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
    LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")
    LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
    LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
    LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")


@@ -3368,7 +3408,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
    LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
    LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")
    LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
    LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
    LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")

-   LNG(wxLANGUAGE_KURDISH,                    "ku"   , 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
+   LNG(wxLANGUAGE_KURDISH,                    "ku_TR", 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")

    LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
    LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
    LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")
    LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
    LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
    LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")


@@ -3387,7 +3427,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
    LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
    LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")
    LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
    LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
    LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")

-   LNG(wxLANGUAGE_NEPALI,                     "ne"   , LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
+   LNG(wxLANGUAGE_NEPALI,                     "ne_NP", LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")

    LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
    LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
    LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
    LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
    LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
    LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")


@@ -3408,8 +3448,11 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
    LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , wxLayout_LeftToRight, "Scots Gaelic")
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
    LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , wxLayout_LeftToRight, "Scots Gaelic")

+   LNG(wxLANGUAGE_SERBIAN,                    "sr_SR", LANG_SERBIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Serbian")
+   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_SR", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
+   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_SR@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")

    LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
    LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")

-   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
+   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")

    LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , wxLayout_LeftToRight, "Serbo-Croatian")
    LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
    LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")
    LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , wxLayout_LeftToRight, "Serbo-Croatian")
    LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
    LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")


@@ -3466,6 +3509,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
    LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
    LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
    LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
    LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
    LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")

+   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", 0     , 0                                 , wxLayout_LeftToRight, "Valencian")

    LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
    LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
    LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")
    LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
    LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
    LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")