Make wxLanguageInfo::GetLocaleName() consistent across platforms

Check that the locale can be indeed set to the given string in Unix
version too, there doesn't seem to be any good reason to do it for MSW
only.

include/wx/intl.h

@@ -72,17 +72,11 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
 #endif // __WINDOWS__
 
     // return the locale name corresponding to this language usable with
-    // setlocale() on the current system
+    // setlocale() on the current system or empty string if this locale is not
+    // supported
     wxString GetLocaleName() const;
 };
 
-// for Unix systems GetLocaleName() is trivial so implement it inline here, for
-// MSW it's implemented in intl.cpp
-#ifndef __WINDOWS__
-inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; }
-#endif // !__WINDOWS__
-
-
 // ----------------------------------------------------------------------------
 // wxLocaleCategory: the category of locale settings
 // ----------------------------------------------------------------------------

interface/wx/intl.h

@@ -55,8 +55,13 @@ struct wxLanguageInfo
     /// @onlyfor{wxmsw}
     wxUint32 GetLCID() const;
 
-    /// Return the locale name corresponding to this language usable with
-    /// @c setlocale() on the current system.
+    /**
+        Return the locale name corresponding to this language usable with
+        @c setlocale() on the current system.
+
+        If setting locale for this language is not supported, the returned
+        string is empty.
+     */
     wxString GetLocaleName() const;
 };
 

src/common/intl.cpp

@@ -205,7 +205,14 @@ wxString wxLanguageInfo::GetLocaleName() const
     return CanSetLocale(locale) ? locale : wxString();
 }
 
-#endif // __WINDOWS__
+#else // !__WINDOWS__
+
+wxString wxLanguageInfo::GetLocaleName() const
+{
+    return CanSetLocale(CanonicalName) ? CanonicalName : wxString();
+}
+
+#endif // __WINDOWS__/!__WINDOWS__
 
 // ----------------------------------------------------------------------------
 // wxLocale