no changes, just refactor the code sending spin update event to SendSpinUpdate()...

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 4d689229a7280b1edc3a86c8657c28eda3c78f5e..9a2dc0053608b52307b3002ac07ae10cca26ffe2 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__BORLAND__) && !defined(__WXDEBUG__)
+#if defined(__BORLANDC__) && !defined(__WXDEBUG__)

     // There's a bug in Borland's compiler that breaks wxLocale with -O2,
     // so make sure that flag is not used for this file:
     #pragma option -O1
     // There's a bug in Borland's compiler that breaks wxLocale with -O2,
     // so make sure that flag is not used for this file:
     #pragma option -O1


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

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

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

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

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


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

-#ifdef __WIN32__
+#if defined(__WIN32__)

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


@@ -2734,10 +2734,23 @@ bool wxLocale::IsAvailable(int lang)
                          SORT_DEFAULT),
                 LCID_INSTALLED
             ) )
                          SORT_DEFAULT),
                 LCID_INSTALLED
             ) )

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

 
     return true;
 }
 
     return true;
 }


@@ -2751,7 +2764,7 @@ bool wxLocale::IsLoaded(const wxChar *szDomain) const
 // add a catalog to our linked list
 bool wxLocale::AddCatalog(const wxChar *szDomain)
 {
 // add a catalog to our linked list
 bool wxLocale::AddCatalog(const wxChar *szDomain)
 {

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

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