To avoid error message, do not even try to set focus on MSW popup window that doesn...

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

diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp
index e72fd843a058b91396770b96254a16caf0fc1042..b04288c64869562cb034d51c12ea097fc7842c79 100644 (file)
--- a/src/common/xlocale.cpp
+++ b/src/common/xlocale.cpp
@@ -71,7 +71,7 @@ wxXLocale& wxXLocale::GetCLocale()
 {
     if ( !gs_cLocale )
     {
 {
     if ( !gs_cLocale )
     {

-        gs_cLocale = new wxXLocale(wx_static_cast(wxXLocaleCTag *, NULL));
+        gs_cLocale = new wxXLocale(static_cast<wxXLocaleCTag *>(NULL));

     }
 
     return *gs_cLocale;
     }
 
     return *gs_cLocale;


@@ -88,11 +88,7 @@ wxXLocale::wxXLocale(wxLanguage lang)
     }
     else
     {
     }
     else
     {

-#ifdef __WXMSW__
-        Init(info->Description);
-#else
-        Init(info->CanonicalName);
-#endif
+        Init(info->GetLocaleName().c_str());

     }
 }
 
     }
 }