added new project file having the new files

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6ba837647e56322114430ae2af8244c642fbd132..711788c1e4c6bde0ba28b25971943406d28da07b 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        intl.cpp
+// Name:        src/common/intl.cpp

 // Purpose:     Internationalization and localisation for wxWindows
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     Internationalization and localisation for wxWindows
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -31,26 +31,35 @@
 #if wxUSE_INTL
 
 // standard headers
 #if wxUSE_INTL
 
 // standard headers

-#include  <locale.h>
-#include  <ctype.h>
+#include <locale.h>
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_LANGINFO_H
+  #include <langinfo.h>
+#endif

 
 // wxWindows
 
 // wxWindows

-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/tokenzr.h"
-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/debug.h"
+    #include "wx/utils.h"
+    #include "wx/dynarray.h"
+#endif // WX_PRECOMP
+

 #include "wx/file.h"
 #include "wx/file.h"

-#include "wx/log.h"
-#include "wx/debug.h"
-#include "wx/utils.h"
-#include "wx/dynarray.h"
+#include "wx/tokenzr.h"
+#include "wx/module.h"
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
+

 #ifdef __WIN32__
 #ifdef __WIN32__

-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"
+#elif defined(__UNIX_LIKE__)
+    #include "wx/fontmap.h"         // for CharsetToEncoding()

 #endif
 
 #endif
 

-
-#include <stdlib.h>
-

 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------


@@ -85,9 +94,7 @@ typedef unsigned char size_t8;
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning

-                size_t intsize = sizeof(int);
-
-                wxASSERT_MSG( intsize == 4,
+                wxASSERT_MSG( wxAssertIsEqual(sizeof(int), 4),

                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;
                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;


@@ -105,6 +112,11 @@ const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
 // extension of ".mo" files
 #define MSGCATALOG_EXTENSION  _T(".mo")
 
 // 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 '_'
+

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


@@ -139,6 +151,23 @@ public:
 
 static wxLocale *wxSetLocale(wxLocale *pLocale);
 
 
 static wxLocale *wxSetLocale(wxLocale *pLocale);
 

+// helper functions of GetSystemLanguage()
+#ifdef __UNIX__
+
+// get just the language part
+static inline wxString ExtractLang(const wxString& langFull)
+{
+    return langFull.Left(LEN_LANG);
+}
+
+// get everything else (including the leading '_')
+static inline wxString ExtractNotLang(const wxString& langFull)
+{
+    return langFull.Mid(LEN_LANG);
+}
+
+#endif // __UNIX__
+

 // ----------------------------------------------------------------------------
 // wxMsgCatalog corresponds to one disk-file message catalog.
 //
 // ----------------------------------------------------------------------------
 // wxMsgCatalog corresponds to one disk-file message catalog.
 //


@@ -206,7 +235,7 @@ private:
 
   // utility functions
     // calculate the hash value of given string
 
   // utility functions
     // calculate the hash value of given string

-  static inline size_t32 GetHash(const char *sz);
+  static size_t32 GetHash(const char *sz);

     // big<->little endian
   inline size_t32 Swap(size_t32 ui) const;
 
     // big<->little endian
   inline size_t32 Swap(size_t32 ui) const;
 


@@ -360,7 +389,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool b
 
   wxString strFullName;
   if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {
 
   wxString strFullName;
   if ( !wxFindFileInPath(&strFullName, searchPath, strFile) ) {

-    wxLogWarning(_("catalog file for domain '%s' not found."), szName.c_str());
+    wxLogVerbose(_("catalog file for domain '%s' not found."), szName.c_str());

     return FALSE;
   }
 
     return FALSE;
   }
 


@@ -436,19 +465,17 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
 
     size_t32 nIncr = 1 + (nHashVal % (m_nHashSize - 2));
 
 
     size_t32 nIncr = 1 + (nHashVal % (m_nHashSize - 2));
 

-#if defined(__VISAGECPP__)
-// VA just can't stand while(1) or while(TRUE)
-    bool bOs2var = TRUE;
-    while(bOs2var) {
-#else
-    while (1) {
-#endif
+    for ( ;; ) {

       size_t32 nStr = Swap(m_pHashTable[nIndex]);
       if ( nStr == 0 )
         return NULL;
 
       size_t32 nStr = Swap(m_pHashTable[nIndex]);
       if ( nStr == 0 )
         return NULL;
 

-      if ( strcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 )
-        return StringAtOfs(m_pTransTable, nStr - 1);
+      if ( strcmp(szOrig, StringAtOfs(m_pOrigTable, nStr - 1)) == 0 ) {
+        // work around for BC++ 5.5 bug: without a temp var, the optimizer
+        // breaks the code and the return value is incorrect
+        const char *tmp = StringAtOfs(m_pTransTable, nStr - 1);
+        return tmp;
+      }

 
       if ( nIndex >= m_nHashSize - nIncr)
         nIndex -= m_nHashSize - nIncr;
 
       if ( nIndex >= m_nHashSize - nIncr)
         nIndex -= m_nHashSize - nIncr;


@@ -467,8 +494,11 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
         top = current;
       else if ( res > 0 )
         bottom = current + 1;
         top = current;
       else if ( res > 0 )
         bottom = current + 1;

-      else    // found!
-        return StringAtOfs(m_pTransTable, current);
+      else {   // found!
+        // work around the same BC++ 5.5 bug as above
+        const char *tmp = StringAtOfs(m_pTransTable, current);
+        return tmp;
+      }

     }
   }
 
     }
   }
 


@@ -476,24 +506,15 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
   return NULL;
 }
 
   return NULL;
 }
 

-
-#if wxUSE_GUI
-#include "wx/fontmap.h"
-#include "wx/encconv.h"
-#endif
-

 void wxMsgCatalog::ConvertEncoding()
 {
 void wxMsgCatalog::ConvertEncoding()
 {

-#if wxUSE_GUI
-    wxFontEncoding enc;
-

     // first, find encoding header:
     const char *hdr = StringAtOfs(m_pOrigTable, 0);
     // first, find encoding header:
     const char *hdr = StringAtOfs(m_pOrigTable, 0);

-    if (hdr == NULL) return; // not supported by this catalog, does not have non-fuzzy header
-    if (hdr[0] != 0) return; // ditto
+    if ( hdr == NULL || hdr[0] != 0 ) {
+        // not supported by this catalog, does not have correct header
+        return;
+    }

 
 

-    /* we support catalogs with header (msgid "") that is _not_ marked as "#, fuzzy" (otherwise
-       the string would not be included into compiled catalog) */

     wxString header(StringAtOfs(m_pTransTable, 0));
     wxString charset;
     int pos = header.Find(wxT("Content-Type: text/plain; charset="));
     wxString header(StringAtOfs(m_pTransTable, 0));
     wxString charset;
     int pos = header.Find(wxT("Content-Type: text/plain; charset="));


@@ -503,23 +524,28 @@ void wxMsgCatalog::ConvertEncoding()
     while (header[n] != wxT('\n'))
         charset << header[n++];
 
     while (header[n] != wxT('\n'))
         charset << header[n++];
 

-    enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
+#if wxUSE_FONTMAP
+    wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);

     if ( enc == wxFONTENCODING_SYSTEM )
         return; // unknown encoding
 
     if ( enc == wxFONTENCODING_SYSTEM )
         return; // unknown encoding
 

-    wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
-    if (a[0] == enc)
-        return; // no conversion needed, locale uses native encoding
-
-    if (a.GetCount() == 0)
-        return; // we don't know common equiv. under this platform
+    wxFontEncoding targetEnc = wxLocale::GetSystemEncoding();
+    if (targetEnc == wxFONTENCODING_SYSTEM)
+    {
+        wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
+        if (a[0] == enc)
+            return; // no conversion needed, locale uses native encoding
+        if (a.GetCount() == 0)
+            return; // we don't know common equiv. under this platform
+        targetEnc = a[0];
+    }

 
     wxEncodingConverter converter;
 
     wxEncodingConverter converter;

+    converter.Init(enc, targetEnc);

 
 

-    converter.Init(enc, a[0]);

     for (size_t i = 0; i < m_numStrings; i++)
         converter.Convert((char*)StringAtOfs(m_pTransTable, i));
     for (size_t i = 0; i < m_numStrings; i++)
         converter.Convert((char*)StringAtOfs(m_pTransTable, i));

-#endif
+#endif // wxUSE_FONTMAP

 }
 
 
 }
 
 


@@ -531,13 +557,28 @@ void wxMsgCatalog::ConvertEncoding()
 WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);
 WX_DEFINE_OBJARRAY(wxLanguageInfoArray);
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);
 WX_DEFINE_OBJARRAY(wxLanguageInfoArray);
 

+wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
+
+/*static*/ void wxLocale::CreateLanguagesDB()
+{
+    if (ms_languagesDB == NULL)
+    {
+        ms_languagesDB = new wxLanguageInfoArray;
+        InitLanguagesDB();
+    }
+}
+
+/*static*/ void wxLocale::DestroyLanguagesDB()
+{
+    delete ms_languagesDB;
+    ms_languagesDB = NULL;
+}

 
 
 wxLocale::wxLocale()
 {
   m_pszOldLocale = NULL;
   m_pMsgCat = NULL;
 
 
 wxLocale::wxLocale()
 {
   m_pszOldLocale = NULL;
   m_pMsgCat = NULL;

-  m_languagesDB = NULL;

   m_language = wxLANGUAGE_UNKNOWN;
 }
 
   m_language = wxLANGUAGE_UNKNOWN;
 }
 


@@ -583,37 +624,37 @@ bool wxLocale::Init(const wxChar *szName,
   return bOk;
 }
 
   return bOk;
 }
 

-
-

 bool wxLocale::Init(int language, int flags)
 {
     wxLanguageInfo *info = NULL;
     int lang = language;
 
 bool wxLocale::Init(int language, int flags)
 {
     wxLanguageInfo *info = NULL;
     int lang = language;
 

-    if (m_languagesDB == NULL)
+    CreateLanguagesDB();
+
+    if (lang == wxLANGUAGE_DEFAULT)

     {
     {

-        m_languagesDB = new wxLanguageInfoArray;
-        InitLanguagesDB();
+        // auto detect the language
+        lang = GetSystemLanguage();

     }
 
     }
 

-    if (lang == wxLANGUAGE_DEFAULT) lang = GetSystemLanguage();  
-    if (lang != wxLANGUAGE_UNKNOWN)
+    // We failed to detect system language, so we will use English:
+    if (lang == wxLANGUAGE_UNKNOWN)
+    {
+       return FALSE;
+    }
+
+    if (lang != wxLANGUAGE_DEFAULT)

     {
     {

-        for (size_t i = 0; i < m_languagesDB->GetCount(); i++)
+        for (size_t i = 0; i < ms_languagesDB->GetCount(); i++)

         {
         {

-            if (m_languagesDB->Item(i).Language == lang)
+            if (ms_languagesDB->Item(i).Language == lang)

             {
             {

-                info = &m_languagesDB->Item(i);
+                info = &ms_languagesDB->Item(i);

                 break;
             }
         }
     }
 
                 break;
             }
         }
     }
 

-    // We failed to detect system language, so we will use English:
-    if (lang == wxLANGUAGE_UNKNOWN)
-    {
-       return FALSE;
-    }

     // Unknown language:
     if (info == NULL)
     {
     // Unknown language:
     if (info == NULL)
     {


@@ -625,11 +666,13 @@ bool wxLocale::Init(int language, int flags)
     wxString canonical = info->CanonicalName;
     wxString locale;
     wxChar *retloc;
     wxString canonical = info->CanonicalName;
     wxString locale;
     wxChar *retloc;

-    
+

     // Set the locale:
 #ifdef __UNIX__
     // Set the locale:
 #ifdef __UNIX__

-    if (language == wxLANGUAGE_DEFAULT) locale = wxEmptyString;
-    else locale = info->CanonicalName;
+    if (language == wxLANGUAGE_DEFAULT)
+        locale = wxEmptyString;
+    else
+        locale = info->CanonicalName;

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


@@ -659,30 +702,58 @@ bool wxLocale::Init(int language, int flags)
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
         return FALSE;
     }
         wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
         return FALSE;
     }

-

 #elif defined(__WIN32__)
     if (language != wxLANGUAGE_DEFAULT)
     {
 #elif defined(__WIN32__)
     if (language != wxLANGUAGE_DEFAULT)
     {

-        wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang), 
-                                 SORT_DEFAULT);
-        if (!SetThreadLocale(lcid))
+        if (info->WinLang == 0)
+        {
+            wxLogWarning(wxT("Locale '%s' not supported by OS."), name.c_str());
+            retloc = wxT("C");
+        }
+        else

         {
         {

-            wxLogLastError(wxT("SetThreadLocale"));
-            wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
-            return FALSE;
+            wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
+                                     SORT_DEFAULT);
+            if (SetThreadLocale(lcid))
+                retloc = wxSetlocale(LC_ALL, wxEmptyString);
+            else
+            {
+                // Windows9X doesn't support SetThreadLocale, so we must
+                // translate LCID to CRT's setlocale string ourselves
+                locale.Empty();
+                if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+                {
+                    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 (locale.IsEmpty())
+                {
+                    wxLogLastError(wxT("SetThreadLocale"));
+                    wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
+                    return FALSE;
+                }
+                else
+                    retloc = wxSetlocale(LC_ALL, locale);
+            }

         }
     }
         }
     }

-    retloc = wxSetlocale(LC_ALL, wxEmptyString);
+    else
+        retloc = wxSetlocale(LC_ALL, wxEmptyString);
+

     if (retloc == NULL)
     {
         wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
         return FALSE;
     }
     if (retloc == NULL)
     {
         wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
         return FALSE;
     }

-    
+

 #else
     return FALSE;
 #endif
 #else
     return FALSE;
 #endif

-    
+

     return Init(name, canonical, wxString(retloc),
                 (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                 (flags & wxLOCALE_CONV_ENCODING) != 0);
     return Init(name, canonical, wxString(retloc),
                 (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                 (flags & wxLOCALE_CONV_ENCODING) != 0);


@@ -699,126 +770,248 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     //else: already have it
 }
 
     //else: already have it
 }
 

-
-int wxLocale::GetSystemLanguage()
+/*static*/ int wxLocale::GetSystemLanguage()

 {
 {

-    int wxlang = wxLANGUAGE_UNKNOWN;
-    size_t i;
+    CreateLanguagesDB();
+
+    // init i to avoid compiler warning
+    size_t i = 0,
+           count = ms_languagesDB->GetCount();

 
 

-    wxASSERT_MSG(m_languagesDB != NULL, "Languages DB not initialized, call wxLocale::Init!");
-    

 #if defined(__UNIX__)
 #if defined(__UNIX__)

-    wxString lang;
-    if (!wxGetEnv(wxT("LC_ALL"), &lang) && 
-        !wxGetEnv(wxT("LC_MESSAGES"), &lang) &&
-        !wxGetEnv(wxT("LANG"), &lang))         
-        return wxLANGUAGE_UNKNOWN;
-
-    bool is_abbrev = lang.Len() == 2 || 
-                     (lang.Len() == 5 && lang[2] == wxT('_'));
-        
-    // 0. Make sure the abbrev is according to latest ISO 639
-    //    (this is neccessary because glibc uses iw and in instead
-    //    of he and id respectively).
-    if (is_abbrev)
+    // first get the string identifying the language from the environment
+    wxString langFull;
+    if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
+        !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
+        !wxGetEnv(wxT("LANG"), &langFull))
+    {
+        // no language specified, threat it as English
+        return wxLANGUAGE_ENGLISH;
+    }
+
+    if ( langFull == _T("C") )

     {
     {

-       wxString mid = lang.Mid(0,2);
-       if (mid == wxT("iw")) lang = wxT("he") + lang.Mid(3);
-       else if (mid == wxT("in")) lang = wxT("id") + lang.Mid(3);
-       else if (mid == wxT("ji")) lang = wxT("yi") + lang.Mid(3);
+        // default C locale
+        return wxLANGUAGE_ENGLISH;

     }
 
     }
 

-    // 1. Try to find the lang as is:
-    if (is_abbrev)
+    // the language string has the following form
+    //
+    //      lang[_LANG[.encoding]]
+    //
+    // where lang is the primary language, LANG is a sublang
+    //
+    // for example, the following strings are valid:
+    //      fr
+    //      fr_FR
+    //      de_DE.iso88591
+
+    // for now we don't use the encoding, although we probably should (doing
+    // translations of the msg catalogs on the fly as required) (TODO)
+    langFull = langFull.BeforeFirst(_T('.'));
+
+    // in addition to the format above, we also can have full language names
+    // in LANG env var - for example, SuSE is known to use LANG="german" - so
+    // check for this
+
+    // do we have just the language (or sublang too)?
+    bool justLang = langFull.Len() == LEN_LANG;
+    if ( justLang ||
+         (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )

     {
     {

-        for (i = 0; i < m_languagesDB->GetCount(); i++)
+        // 0. Make sure the lang is according to latest ISO 639
+        //    (this is neccessary because glibc uses iw and in instead
+        //    of he and id respectively).
+
+        // the language itself (second part is the dialect/sublang)
+        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
+            lang = langOrig;
+
+        // did we change it?
+        if ( lang != langOrig )

         {
         {

-            if (m_languagesDB->Item(i).CanonicalName == lang)
+            langFull = lang + ExtractNotLang(langFull);
+        }
+
+        // 1. Try to find the language either as is:
+        for ( i = 0; i < count; i++ )
+        {
+            if ( ms_languagesDB->Item(i).CanonicalName == langFull )

             {
             {

-                wxlang = m_languagesDB->Item(i).Language;

                 break;
             }
         }
                 break;
             }
         }

-    }

 
 

-    // 2. If lang is of the form xx_YY, try to find xx:
-    if (wxlang == wxLANGUAGE_UNKNOWN && is_abbrev && lang.Len() == 5)
-    {
-        wxString lang2 = lang.Mid(0,2);
-        for (i = 0; i < m_languagesDB->GetCount(); i++)
+        // 2. If langFull is of the form xx_YY, try to find xx:
+        if ( i == count && !justLang )

         {
         {

-            if (m_languagesDB->Item(i).CanonicalName == lang2)
+            for ( i = 0; i < count; i++ )

             {
             {

-                wxlang = m_languagesDB->Item(i).Language;
-                break;
+                if ( ms_languagesDB->Item(i).CanonicalName == lang )
+                {
+                    break;
+                }

             }
         }
             }
         }

-    }

 
 

-    // 3. If lang is of the form xx, try to find any xx_YY record:
-    if (wxlang == wxLANGUAGE_UNKNOWN && is_abbrev && lang.Len() == 2)
-    {
-        for (i = 0; i < m_languagesDB->GetCount(); i++)
+        // 3. If langFull is of the form xx, try to find any xx_YY record:
+        if ( i == count && justLang )

         {
         {

-            if (m_languagesDB->Item(i).CanonicalName.Mid(0,2) == lang)
+            for ( i = 0; i < count; i++ )

             {
             {

-                wxlang = m_languagesDB->Item(i).Language;
-                break;
+                if ( ExtractLang(ms_languagesDB->Item(i).CanonicalName)
+                        == langFull )
+                {
+                    break;
+                }

             }
         }
     }
             }
         }
     }

-
-    // 4. If everything failed, try to find the name in verbose description
-    //    (SuSE is known to use LANG="german"):
-    if (wxlang == wxLANGUAGE_UNKNOWN && !is_abbrev)
+    else // not standard format

     {
     {

-        for (i = 0; i < m_languagesDB->GetCount(); i++)
+        // try to find the name in verbose description
+        for ( i = 0; i < count; i++ )

         {
         {

-            if (m_languagesDB->Item(i).Description.CmpNoCase(lang) == 0)
+            if (ms_languagesDB->Item(i).Description.CmpNoCase(langFull) == 0)

             {
             {

-                wxlang = m_languagesDB->Item(i).Language;

                 break;
             }
         }
     }
                 break;
             }
         }
     }

-

 #elif defined(__WIN32__)
     LCID lcid = GetUserDefaultLCID();
 #elif defined(__WIN32__)
     LCID lcid = GetUserDefaultLCID();

-    if (lcid == 0) return wxLANGUAGE_UNKNOWN;
-    wxUint32 lang = PRIMARYLANGID(LANGIDFROMLCID(lcid));
-    wxUint32 sublang = SUBLANGID(LANGIDFROMLCID(lcid));
-
-    for (i = 0; i < m_languagesDB->GetCount(); i++)
+    if ( lcid != 0 )

     {
     {

-        if (m_languagesDB->Item(i).WinLang == lang &&
-            m_languagesDB->Item(i).WinSublang == sublang)
+        wxUint32 lang = PRIMARYLANGID(LANGIDFROMLCID(lcid));
+        wxUint32 sublang = SUBLANGID(LANGIDFROMLCID(lcid));
+
+        for ( i = 0; i < count; i++ )

         {
         {

-            wxlang = m_languagesDB->Item(i).Language;
-            break;
+            if (ms_languagesDB->Item(i).WinLang == lang &&
+                ms_languagesDB->Item(i).WinSublang == sublang)
+            {
+                break;
+            }

         }
     }
         }
     }

-#endif
+    //else: leave wxlang == wxLANGUAGE_UNKNOWN
+#endif // Unix/Win32
+
+    if ( i < count )
+    {
+        // we did find a matching entry, use it
+        return ms_languagesDB->Item(i).Language;
+    }

 
 

-    return wxlang;
+    // no info about this language in the database
+    return wxLANGUAGE_UNKNOWN;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// encoding stuff
+// ----------------------------------------------------------------------------

 
 

+// 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

 
 

-void wxLocale::AddLanguage(const wxLanguageInfo& info)
+/* static */
+wxString wxLocale::GetSystemEncodingName()

 {
 {

-    wxASSERT_MSG(m_languagesDB != NULL, "Languages DB not initialized, call wxLocale::Init!");
-    m_languagesDB->Add(info);
+    wxString encname;
+
+#ifdef __WIN32__
+    // FIXME: what is the error return value for GetACP()?
+    UINT codepage = ::GetACP();
+    encname.Printf(_T("windows-%u"), codepage);
+#elif defined(__UNIX_LIKE__)
+
+#if defined(HAVE_LANGINFO_H) && defined(CODESET)
+    // GNU libc provides current character set this way (this conforms
+    // to Unix98)
+    char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
+    setlocale(LC_CTYPE, "");
+    char *alang = nl_langinfo(CODESET);
+    setlocale(LC_CTYPE, oldLocale);
+    free(oldLocale);
+    if (alang)
+    {
+        encname = wxConvLibc.cMB2WX(alang);
+    }
+    else
+#endif // HAVE_LANGINFO_H
+    {
+        // if we can't get at the character set directly, try to see if it's in
+        // the environment variables (in most cases this won't work, but I was
+        // out of ideas)
+        wxChar *lang = wxGetenv(wxT("LC_ALL"));
+        wxChar *dot = lang ? wxStrchr(lang, wxT('.')) : (wxChar *)NULL;
+        if (!dot)
+        {
+            lang = wxGetenv(wxT("LC_CTYPE"));
+            if ( lang )
+                dot = wxStrchr(lang, wxT('.'));
+        }
+        if (!dot)
+        {
+            lang = wxGetenv(wxT("LANG"));
+            if ( lang )
+                dot = wxStrchr(lang, wxT('.'));
+        }
+
+        if ( dot )
+        {
+            encname = dot+1;
+        }
+    }
+#endif // Win32/Unix
+
+    return encname;

 }
 
 }
 

+/* static */
+wxFontEncoding wxLocale::GetSystemEncoding()
+{
+#ifdef __WIN32__
+    UINT codepage = ::GetACP();
+
+    // wxWindows only knows about CP1250-1257
+    if ( codepage >= 1250 && codepage <= 1257 )
+    {
+        return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
+    }
+#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
+    wxString encname = GetSystemEncodingName();
+    if ( !encname.empty() )
+    {
+        return wxTheFontMapper->
+            CharsetToEncoding(encname, FALSE /* not interactive */);
+    }
+#endif // Win32/Unix

 
 

+    return wxFONTENCODING_SYSTEM;
+}
+
+/*static*/ void wxLocale::AddLanguage(const wxLanguageInfo& info)
+{
+    CreateLanguagesDB();
+    ms_languagesDB->Add(info);
+}

 
 wxString wxLocale::GetSysName() const
 {
     return wxSetlocale(LC_ALL, NULL);
 }
 
 
 wxString wxLocale::GetSysName() const
 {
     return wxSetlocale(LC_ALL, NULL);
 }
 

-
-

 // clean up
 wxLocale::~wxLocale()
 {
 // clean up
 wxLocale::~wxLocale()
 {


@@ -830,8 +1023,6 @@ wxLocale::~wxLocale()
         delete pTmpCat;
     }
 
         delete pTmpCat;
     }
 

-    delete m_languagesDB;
-

     // restore old locale
     wxSetLocale(m_pOldLocale);
     wxSetlocale(LC_ALL, m_pszOldLocale);
     // restore old locale
     wxSetLocale(m_pOldLocale);
     wxSetlocale(LC_ALL, m_pszOldLocale);


@@ -937,11 +1128,6 @@ bool wxLocale::AddCatalog(const wxChar *szDomain)
   }
 }
 
   }
 }
 

-
-
-
-
-

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


@@ -966,20 +1152,523 @@ wxLocale *wxSetLocale(wxLocale *pLocale)
 
 
 
 
 
 

+// ----------------------------------------------------------------------------
+// wxLocale module (for lazy destruction of languagesDB)
+// ----------------------------------------------------------------------------
+
+class wxLocaleModule: public wxModule
+{
+    DECLARE_DYNAMIC_CLASS(wxLocaleModule)
+    public:
+        wxLocaleModule() {}
+        bool OnInit() { return TRUE; }
+        void OnExit() { wxLocale::DestroyLanguagesDB(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
+
+

 
 // ----------------------------------------------------------------------------
 // default languages table & initialization
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // default languages table & initialization
 // ----------------------------------------------------------------------------
 

+
+
+// --- --- --- generated code begins here --- --- ---
+

 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 
 // This table is generated by misc/languages/genlang.py
 // When making changes, please put them into misc/languages/langtabl.txt
 

-#ifdef __WXMSW__
+#if !defined(__WIN32__) || defined(__WXMICROWIN__)
+
+#define SETWINLANG(info,lang,sublang)
+
+#else
+

 #define SETWINLANG(info,lang,sublang) \
     info.WinLang = lang, info.WinSublang = sublang;
 #define SETWINLANG(info,lang,sublang) \
     info.WinLang = lang, info.WinSublang = sublang;

-#else
-#define SETWINLANG(info,lang,sublang)
+
+#ifndef LANG_AFRIKAANS
+#define LANG_AFRIKAANS (0)
+#endif
+#ifndef LANG_ALBANIAN
+#define LANG_ALBANIAN (0)
+#endif
+#ifndef LANG_ARABIC
+#define LANG_ARABIC (0)
+#endif
+#ifndef LANG_ARMENIAN
+#define LANG_ARMENIAN (0)
+#endif
+#ifndef LANG_ASSAMESE
+#define LANG_ASSAMESE (0)
+#endif
+#ifndef LANG_AZERI
+#define LANG_AZERI (0)
+#endif
+#ifndef LANG_BASQUE
+#define LANG_BASQUE (0)
+#endif
+#ifndef LANG_BELARUSIAN
+#define LANG_BELARUSIAN (0)
+#endif
+#ifndef LANG_BENGALI
+#define LANG_BENGALI (0)

 #endif
 #endif

+#ifndef LANG_BULGARIAN
+#define LANG_BULGARIAN (0)
+#endif
+#ifndef LANG_CATALAN
+#define LANG_CATALAN (0)
+#endif
+#ifndef LANG_CHINESE
+#define LANG_CHINESE (0)
+#endif
+#ifndef LANG_CROATIAN
+#define LANG_CROATIAN (0)
+#endif
+#ifndef LANG_CZECH
+#define LANG_CZECH (0)
+#endif
+#ifndef LANG_DANISH
+#define LANG_DANISH (0)
+#endif
+#ifndef LANG_DUTCH
+#define LANG_DUTCH (0)
+#endif
+#ifndef LANG_ENGLISH
+#define LANG_ENGLISH (0)
+#endif
+#ifndef LANG_ESTONIAN
+#define LANG_ESTONIAN (0)
+#endif
+#ifndef LANG_FAEROESE
+#define LANG_FAEROESE (0)
+#endif
+#ifndef LANG_FARSI
+#define LANG_FARSI (0)
+#endif
+#ifndef LANG_FINNISH
+#define LANG_FINNISH (0)
+#endif
+#ifndef LANG_FRENCH
+#define LANG_FRENCH (0)
+#endif
+#ifndef LANG_GEORGIAN
+#define LANG_GEORGIAN (0)
+#endif
+#ifndef LANG_GERMAN
+#define LANG_GERMAN (0)
+#endif
+#ifndef LANG_GREEK
+#define LANG_GREEK (0)
+#endif
+#ifndef LANG_GUJARATI
+#define LANG_GUJARATI (0)
+#endif
+#ifndef LANG_HEBREW
+#define LANG_HEBREW (0)
+#endif
+#ifndef LANG_HINDI
+#define LANG_HINDI (0)
+#endif
+#ifndef LANG_HUNGARIAN
+#define LANG_HUNGARIAN (0)
+#endif
+#ifndef LANG_ICELANDIC
+#define LANG_ICELANDIC (0)
+#endif
+#ifndef LANG_INDONESIAN
+#define LANG_INDONESIAN (0)
+#endif
+#ifndef LANG_ITALIAN
+#define LANG_ITALIAN (0)
+#endif
+#ifndef LANG_JAPANESE
+#define LANG_JAPANESE (0)
+#endif
+#ifndef LANG_KANNADA
+#define LANG_KANNADA (0)
+#endif
+#ifndef LANG_KASHMIRI
+#define LANG_KASHMIRI (0)
+#endif
+#ifndef LANG_KAZAK
+#define LANG_KAZAK (0)
+#endif
+#ifndef LANG_KONKANI
+#define LANG_KONKANI (0)
+#endif
+#ifndef LANG_KOREAN
+#define LANG_KOREAN (0)
+#endif
+#ifndef LANG_LATVIAN
+#define LANG_LATVIAN (0)
+#endif
+#ifndef LANG_LITHUANIAN
+#define LANG_LITHUANIAN (0)
+#endif
+#ifndef LANG_MACEDONIAN
+#define LANG_MACEDONIAN (0)
+#endif
+#ifndef LANG_MALAY
+#define LANG_MALAY (0)
+#endif
+#ifndef LANG_MALAYALAM
+#define LANG_MALAYALAM (0)
+#endif
+#ifndef LANG_MANIPURI
+#define LANG_MANIPURI (0)
+#endif
+#ifndef LANG_MARATHI
+#define LANG_MARATHI (0)
+#endif
+#ifndef LANG_NEPALI
+#define LANG_NEPALI (0)
+#endif
+#ifndef LANG_NORWEGIAN
+#define LANG_NORWEGIAN (0)
+#endif
+#ifndef LANG_ORIYA
+#define LANG_ORIYA (0)
+#endif
+#ifndef LANG_POLISH
+#define LANG_POLISH (0)
+#endif
+#ifndef LANG_PORTUGUESE
+#define LANG_PORTUGUESE (0)
+#endif
+#ifndef LANG_PUNJABI
+#define LANG_PUNJABI (0)
+#endif
+#ifndef LANG_ROMANIAN
+#define LANG_ROMANIAN (0)
+#endif
+#ifndef LANG_RUSSIAN
+#define LANG_RUSSIAN (0)
+#endif
+#ifndef LANG_SANSKRIT
+#define LANG_SANSKRIT (0)
+#endif
+#ifndef LANG_SERBIAN
+#define LANG_SERBIAN (0)
+#endif
+#ifndef LANG_SINDHI
+#define LANG_SINDHI (0)
+#endif
+#ifndef LANG_SLOVAK
+#define LANG_SLOVAK (0)
+#endif
+#ifndef LANG_SLOVENIAN
+#define LANG_SLOVENIAN (0)
+#endif
+#ifndef LANG_SPANISH
+#define LANG_SPANISH (0)
+#endif
+#ifndef LANG_SWAHILI
+#define LANG_SWAHILI (0)
+#endif
+#ifndef LANG_SWEDISH
+#define LANG_SWEDISH (0)
+#endif
+#ifndef LANG_TAMIL
+#define LANG_TAMIL (0)
+#endif
+#ifndef LANG_TATAR
+#define LANG_TATAR (0)
+#endif
+#ifndef LANG_TELUGU
+#define LANG_TELUGU (0)
+#endif
+#ifndef LANG_THAI
+#define LANG_THAI (0)
+#endif
+#ifndef LANG_TURKISH
+#define LANG_TURKISH (0)
+#endif
+#ifndef LANG_UKRAINIAN
+#define LANG_UKRAINIAN (0)
+#endif
+#ifndef LANG_URDU
+#define LANG_URDU (0)
+#endif
+#ifndef LANG_UZBEK
+#define LANG_UZBEK (0)
+#endif
+#ifndef LANG_VIETNAMESE
+#define LANG_VIETNAMESE (0)
+#endif
+#ifndef SUBLANG_ARABIC_ALGERIA
+#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_BAHRAIN
+#define SUBLANG_ARABIC_BAHRAIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_EGYPT
+#define SUBLANG_ARABIC_EGYPT SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_IRAQ
+#define SUBLANG_ARABIC_IRAQ SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_JORDAN
+#define SUBLANG_ARABIC_JORDAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_KUWAIT
+#define SUBLANG_ARABIC_KUWAIT SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_LEBANON
+#define SUBLANG_ARABIC_LEBANON SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_LIBYA
+#define SUBLANG_ARABIC_LIBYA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_MOROCCO
+#define SUBLANG_ARABIC_MOROCCO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_OMAN
+#define SUBLANG_ARABIC_OMAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_QATAR
+#define SUBLANG_ARABIC_QATAR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_SAUDI_ARABIA
+#define SUBLANG_ARABIC_SAUDI_ARABIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_SYRIA
+#define SUBLANG_ARABIC_SYRIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_TUNISIA
+#define SUBLANG_ARABIC_TUNISIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_UAE
+#define SUBLANG_ARABIC_UAE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_YEMEN
+#define SUBLANG_ARABIC_YEMEN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_AZERI_CYRILLIC
+#define SUBLANG_AZERI_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_AZERI_LATIN
+#define SUBLANG_AZERI_LATIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_SIMPLIFIED
+#define SUBLANG_CHINESE_SIMPLIFIED SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_TRADITIONAL
+#define SUBLANG_CHINESE_TRADITIONAL SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_HONGKONG
+#define SUBLANG_CHINESE_HONGKONG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_MACAU
+#define SUBLANG_CHINESE_MACAU SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_SINGAPORE
+#define SUBLANG_CHINESE_SINGAPORE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_DUTCH
+#define SUBLANG_DUTCH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_DUTCH_BELGIAN
+#define SUBLANG_DUTCH_BELGIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_UK
+#define SUBLANG_ENGLISH_UK SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_US
+#define SUBLANG_ENGLISH_US SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_AUS
+#define SUBLANG_ENGLISH_AUS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_BELIZE
+#define SUBLANG_ENGLISH_BELIZE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_CAN
+#define SUBLANG_ENGLISH_CAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_CARIBBEAN
+#define SUBLANG_ENGLISH_CARIBBEAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_EIRE
+#define SUBLANG_ENGLISH_EIRE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_JAMAICA
+#define SUBLANG_ENGLISH_JAMAICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_NZ
+#define SUBLANG_ENGLISH_NZ SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_PHILIPPINES
+#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
+#define SUBLANG_ENGLISH_SOUTH_AFRICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_TRINIDAD
+#define SUBLANG_ENGLISH_TRINIDAD SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_ZIMBABWE
+#define SUBLANG_ENGLISH_ZIMBABWE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH
+#define SUBLANG_FRENCH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_BELGIAN
+#define SUBLANG_FRENCH_BELGIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_CANADIAN
+#define SUBLANG_FRENCH_CANADIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_LUXEMBOURG
+#define SUBLANG_FRENCH_LUXEMBOURG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_MONACO
+#define SUBLANG_FRENCH_MONACO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_SWISS
+#define SUBLANG_FRENCH_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN
+#define SUBLANG_GERMAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_AUSTRIAN
+#define SUBLANG_GERMAN_AUSTRIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_LIECHTENSTEIN
+#define SUBLANG_GERMAN_LIECHTENSTEIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_LUXEMBOURG
+#define SUBLANG_GERMAN_LUXEMBOURG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_SWISS
+#define SUBLANG_GERMAN_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ITALIAN
+#define SUBLANG_ITALIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ITALIAN_SWISS
+#define SUBLANG_ITALIAN_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_KASHMIRI_INDIA
+#define SUBLANG_KASHMIRI_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_KOREAN
+#define SUBLANG_KOREAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_LITHUANIAN
+#define SUBLANG_LITHUANIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+#define SUBLANG_MALAY_BRUNEI_DARUSSALAM SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_MALAY_MALAYSIA
+#define SUBLANG_MALAY_MALAYSIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NEPALI_INDIA
+#define SUBLANG_NEPALI_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NORWEGIAN_BOKMAL
+#define SUBLANG_NORWEGIAN_BOKMAL SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NORWEGIAN_NYNORSK
+#define SUBLANG_NORWEGIAN_NYNORSK SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_PORTUGUESE
+#define SUBLANG_PORTUGUESE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_PORTUGUESE_BRAZILIAN
+#define SUBLANG_PORTUGUESE_BRAZILIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SERBIAN_CYRILLIC
+#define SUBLANG_SERBIAN_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SERBIAN_LATIN
+#define SUBLANG_SERBIAN_LATIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH
+#define SUBLANG_SPANISH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_ARGENTINA
+#define SUBLANG_SPANISH_ARGENTINA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_BOLIVIA
+#define SUBLANG_SPANISH_BOLIVIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_CHILE
+#define SUBLANG_SPANISH_CHILE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_COLOMBIA
+#define SUBLANG_SPANISH_COLOMBIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_COSTA_RICA
+#define SUBLANG_SPANISH_COSTA_RICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
+#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_ECUADOR
+#define SUBLANG_SPANISH_ECUADOR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_EL_SALVADOR
+#define SUBLANG_SPANISH_EL_SALVADOR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_GUATEMALA
+#define SUBLANG_SPANISH_GUATEMALA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_HONDURAS
+#define SUBLANG_SPANISH_HONDURAS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_MEXICAN
+#define SUBLANG_SPANISH_MEXICAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_MODERN
+#define SUBLANG_SPANISH_MODERN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_NICARAGUA
+#define SUBLANG_SPANISH_NICARAGUA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PANAMA
+#define SUBLANG_SPANISH_PANAMA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PARAGUAY
+#define SUBLANG_SPANISH_PARAGUAY SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PERU
+#define SUBLANG_SPANISH_PERU SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PUERTO_RICO
+#define SUBLANG_SPANISH_PUERTO_RICO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_URUGUAY
+#define SUBLANG_SPANISH_URUGUAY SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_VENEZUELA
+#define SUBLANG_SPANISH_VENEZUELA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SWEDISH
+#define SUBLANG_SWEDISH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SWEDISH_FINLAND
+#define SUBLANG_SWEDISH_FINLAND SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_URDU_INDIA
+#define SUBLANG_URDU_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_URDU_PAKISTAN
+#define SUBLANG_URDU_PAKISTAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_UZBEK_CYRILLIC
+#define SUBLANG_UZBEK_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_UZBEK_LATIN
+#define SUBLANG_UZBEK_LATIN SUBLANG_DEFAULT
+#endif
+
+
+#endif // __WIN32__

 
 #define LNG(wxlang, canonical, winlang, winsublang, desc) \
     info.Language = wxlang;                               \
 
 #define LNG(wxlang, canonical, winlang, winsublang, desc) \
     info.Language = wxlang;                               \


@@ -992,8 +1681,8 @@ void wxLocale::InitLanguagesDB()
 {
    wxLanguageInfo info;
    wxStringTokenizer tkn;
 {
    wxLanguageInfo info;
    wxStringTokenizer tkn;

-   
-   LNG(wxLANGUAGE_ABKHAZIAN,                  "ab"   , 0              , 0                                 , "Abkhazian")
+
+      LNG(wxLANGUAGE_ABKHAZIAN,                  "ab"   , 0              , 0                                 , "Abkhazian")

    LNG(wxLANGUAGE_AFAR,                       "aa"   , 0              , 0                                 , "Afar")
    LNG(wxLANGUAGE_AFRIKAANS,                  "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT                   , "Afrikaans")
    LNG(wxLANGUAGE_ALBANIAN,                   "sq_AL", LANG_ALBANIAN  , SUBLANG_DEFAULT                   , "Albanian")
    LNG(wxLANGUAGE_AFAR,                       "aa"   , 0              , 0                                 , "Afar")
    LNG(wxLANGUAGE_AFRIKAANS,                  "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT                   , "Afrikaans")
    LNG(wxLANGUAGE_ALBANIAN,                   "sq_AL", LANG_ALBANIAN  , SUBLANG_DEFAULT                   , "Albanian")


@@ -1066,7 +1755,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , "Esperanto")
    LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , "Estonian")
    LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , "Faeroese")
    LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , "Esperanto")
    LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , "Estonian")
    LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , "Faeroese")

-   LNG(wxLANGUAGE_FARSI,                      ""     , LANG_FARSI     , SUBLANG_DEFAULT                   , "Farsi")
+   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , "Farsi")

    LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , "Fiji")
    LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , "Finnish")
    LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , "French")
    LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , "Fiji")
    LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , "Finnish")
    LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , "French")


@@ -1107,6 +1796,7 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_KASHMIRI,                   "ks"   , LANG_KASHMIRI  , SUBLANG_DEFAULT                   , "Kashmiri")
    LNG(wxLANGUAGE_KASHMIRI_INDIA,             "ks_IN", LANG_KASHMIRI  , SUBLANG_KASHMIRI_INDIA            , "Kashmiri (India)")
    LNG(wxLANGUAGE_KAZAKH,                     "kk"   , LANG_KAZAK     , SUBLANG_DEFAULT                   , "Kazakh")
    LNG(wxLANGUAGE_KASHMIRI,                   "ks"   , LANG_KASHMIRI  , SUBLANG_DEFAULT                   , "Kashmiri")
    LNG(wxLANGUAGE_KASHMIRI_INDIA,             "ks_IN", LANG_KASHMIRI  , SUBLANG_KASHMIRI_INDIA            , "Kashmiri (India)")
    LNG(wxLANGUAGE_KAZAKH,                     "kk"   , LANG_KAZAK     , SUBLANG_DEFAULT                   , "Kazakh")

+   LNG(wxLANGUAGE_KERNEWEK,                   "kw_GB", 0              , 0                                 , "Kernewek")

    LNG(wxLANGUAGE_KINYARWANDA,                "rw"   , 0              , 0                                 , "Kinyarwanda")
    LNG(wxLANGUAGE_KIRGHIZ,                    "ky"   , 0              , 0                                 , "Kirghiz")
    LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , "Kirundi")
    LNG(wxLANGUAGE_KINYARWANDA,                "rw"   , 0              , 0                                 , "Kinyarwanda")
    LNG(wxLANGUAGE_KIRGHIZ,                    "ky"   , 0              , 0                                 , "Kirghiz")
    LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , "Kirundi")


@@ -1133,14 +1823,12 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , "Nauru")
    LNG(wxLANGUAGE_NEPALI,                     "ne"   , LANG_NEPALI    , SUBLANG_DEFAULT                   , "Nepali")
    LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , "Nepali (India)")
    LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , "Nauru")
    LNG(wxLANGUAGE_NEPALI,                     "ne"   , LANG_NEPALI    , SUBLANG_DEFAULT                   , "Nepali")
    LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , "Nepali (India)")

-   LNG(wxLANGUAGE_NORWEGIAN,                  "no_NO", LANG_NORWEGIAN , SUBLANG_DEFAULT                   , "Norwegian")

    LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "no_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , "Norwegian (Bokmal)")
    LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "no_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , "Norwegian (Bokmal)")

-   LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "no_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , "Norwegian (Nynorsk)")
+   LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , "Norwegian (Nynorsk)")

    LNG(wxLANGUAGE_OCCITAN,                    "oc"   , 0              , 0                                 , "Occitan")
    LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , "Oriya")
    LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , "(Afan) Oromo")
    LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , "Pashto, Pushto")
    LNG(wxLANGUAGE_OCCITAN,                    "oc"   , 0              , 0                                 , "Occitan")
    LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , "Oriya")
    LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , "(Afan) Oromo")
    LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , "Pashto, Pushto")

-   LNG(wxLANGUAGE_PERSIAN,                    "fa_IR", 0              , 0                                 , "Persian")

    LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , "Polish")
    LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , "Portuguese")
    LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , "Portuguese (Brazilian)")
    LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , "Polish")
    LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , "Portuguese")
    LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , "Portuguese (Brazilian)")


@@ -1222,11 +1910,11 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_YORUBA,                     "yo"   , 0              , 0                                 , "Yoruba")
    LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , "Zhuang")
    LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , "Zulu")
    LNG(wxLANGUAGE_YORUBA,                     "yo"   , 0              , 0                                 , "Yoruba")
    LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , "Zhuang")
    LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , "Zulu")

+   

 };
 #undef LNG
 
 };
 #undef LNG
 

-
-
+// --- --- --- generated code ends here --- --- ---

 
 #endif // wxUSE_INTL
 
 
 #endif // wxUSE_INTL