Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index 24d1a3f443e61ca9752c667b9083e82872dbacf6..b04288c64869562cb034d51c12ea097fc7842c79 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -71,7 +71,7 @@ wxXLocale& wxXLocale::GetCLocale()
 {
     if ( !gs_cLocale )
     {
-        gs_cLocale = new wxXLocale(wx_static_cast(wxXLocaleCTag *, NULL));
+        gs_cLocale = new wxXLocale(static_cast<wxXLocaleCTag *>(NULL));
     }
 
     return *gs_cLocale;
@@ -88,14 +88,7 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
-        wxString loc;
-#ifdef __WXMSW__
-        loc = info->Description;
-#else
-        loc = info->CanonicalName;
-#endif
-
-        Init(loc.c_str());
+        Init(info->GetLocaleName().c_str());
     }
 }