From: Vadim Zeitlin Date: Fri, 24 Feb 2006 23:40:18 +0000 (+0000) Subject: we need to pass szLocale allocated by strdup() and not retloc itself to setlocale() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b7e1957a679b13c2dbe299b0a49cbcfc244e605b 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 c1055e99e3..459f3189d6 100644 --- 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; - bool ret = Init(name, canonical, retloc, + bool ret = Init(name, canonical, 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; -#endif +#endif // !WX_NO_LOCALE_SUPPORT }