we need to pass szLocale allocated by strdup() and not retloc itself to setlocale()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c1055e99e338885c529db28fdb6d370127b499e9..459f3189d6253e235eca93a5c02d37d87ea0c990 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1802,7 +1802,7 @@ bool wxLocale::Init(int language, int flags)
 
 #ifndef WX_NO_LOCALE_SUPPORT
     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
 
 #ifndef WX_NO_LOCALE_SUPPORT
     wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;

-    bool ret = Init(name, canonical, retloc,
+    bool ret = Init(name, canonical, szLocale,

                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     free(szLocale);
                     (flags & wxLOCALE_LOAD_DEFAULT) != 0,
                     (flags & wxLOCALE_CONV_ENCODING) != 0);
     free(szLocale);


@@ -1811,7 +1811,7 @@ bool wxLocale::Init(int language, int flags)
         m_language = lang;
 
     return ret;
         m_language = lang;
 
     return ret;

-#endif
+#endif // !WX_NO_LOCALE_SUPPORT

 }
 
 
 }