Use disabled colour for the dropdown arrow of disabled ribbon.

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 97cb520a397b9eec5f633b859419c6512d36672f..a7aaf30597fa935963989ec64c64dc18323a187e 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -121,7 +121,7 @@ inline wxString ExtractNotLang(const wxString& langFull)
 // wxLanguageInfo
 // ----------------------------------------------------------------------------
 
 // wxLanguageInfo
 // ----------------------------------------------------------------------------
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 // helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine
 // whether the locale is Unicode-only (it is if this function returns empty
 
 // helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine
 // whether the locale is Unicode-only (it is if this function returns empty


@@ -177,7 +177,7 @@ wxString wxLanguageInfo::GetLocaleName() const
     return locale;
 }
 
     return locale;
 }
 

-#endif // __WXMSW__
+#endif // __WINDOWS__

 
 // ----------------------------------------------------------------------------
 // wxLocale
 
 // ----------------------------------------------------------------------------
 // wxLocale


@@ -781,8 +781,9 @@ wxString wxLocale::GetSystemEncodingName()
     UINT codepage = ::GetACP();
     encname.Printf(wxS("windows-%u"), codepage);
 #elif defined(__WXMAC__)
     UINT codepage = ::GetACP();
     encname.Printf(wxS("windows-%u"), codepage);
 #elif defined(__WXMAC__)

-    // default is just empty string, this resolves to the default system
-    // encoding later
+    encname = wxCFStringRef::AsString(
+                CFStringGetNameOfEncoding(CFStringGetSystemEncoding())
+              );

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


@@ -1033,7 +1034,14 @@ wxLocale::~wxLocale()
 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, wxS("invalid language") );
+    if ( !info )
+    {
+        // The language is unknown (this normally only happens when we're
+        // passed wxLANGUAGE_DEFAULT), so we can't support it.
+        wxASSERT_MSG( lang == wxLANGUAGE_DEFAULT,
+                      wxS("No info for a valid language?") );
+        return false;
+    }

 
 #if defined(__WIN32__)
     if ( !info->WinLang )
 
 #if defined(__WIN32__)
     if ( !info->WinLang )


@@ -1119,7 +1127,7 @@ wxString wxLocale::GetHeaderValue(const wxString& header,
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 
 // accessors for locale-dependent data
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__) || defined(__WXOSX__)
+#if defined(__WINDOWS__) || defined(__WXOSX__)

 
 namespace
 {
 
 namespace
 {


@@ -1141,7 +1149,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
 
     const char* formatchars =
         "dghHmMsSy"
 
     const char* formatchars =
         "dghHmMsSy"

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         "t"
 #else
         "EawD"
         "t"
 #else
         "EawD"


@@ -1181,7 +1189,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
                             // between 1 and 2 digits for days
                             fmtWX += "%d";
                             break;
                             // between 1 and 2 digits for days
                             fmtWX += "%d";
                             break;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

                         case 3: // ddd
                             fmtWX += "%a";
                             break;
                         case 3: // ddd
                             fmtWX += "%a";
                             break;


@@ -1194,7 +1202,7 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
                             wxFAIL_MSG( "too many 'd's" );
                     }
                     break;
                             wxFAIL_MSG( "too many 'd's" );
                     }
                     break;

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

                 case 'D':
                     switch ( lastCount )
                     {
                 case 'D':
                     switch ( lastCount )
                     {


@@ -1337,12 +1345,12 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
                     wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
 
                     break;
                     wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
 
                     break;

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

                 case 'a':
                     fmtWX += "%p";
                     break;
 #endif
                 case 'a':
                     fmtWX += "%p";
                     break;
 #endif

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

                 case 't':
                     switch ( lastCount )
                     {
                 case 't':
                     switch ( lastCount )
                     {


@@ -1382,9 +1390,9 @@ static wxString TranslateFromUnicodeFormat(const wxString& fmt)
 
 } // anonymous namespace
 
 
 } // anonymous namespace
 

-#endif // __WXMSW__ || __WXOSX__
+#endif // __WINDOWS__ || __WXOSX__

 
 

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

 
 namespace
 {
 
 namespace
 {


@@ -1575,7 +1583,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str.AsString();
 }
 
     return str.AsString();
 }
 

-#else // !__WXMSW__ && !__WXOSX__, assume generic POSIX
+#else // !__WINDOWS__ && !__WXOSX__, assume generic POSIX

 
 namespace
 {
 
 namespace
 {