From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 17 Jan 2003 19:58:53 +0000 (+0000)
Subject: (probably) fixed wxLocale::Init with Borland C++
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b78a78f779b95dc46b66e07fddac87ffb0aed1dc

(probably) fixed wxLocale::Init with Borland C++


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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5115e1d3cd..98bc6dcc07 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -770,9 +770,13 @@ bool wxLocale::Init(int language, int flags)
     return FALSE;
 #endif
 
-    return Init(name, canonical, retloc,
-                (flags & wxLOCALE_LOAD_DEFAULT) != 0,
-                (flags & wxLOCALE_CONV_ENCODING) != 0);
+    wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
+    bool ret = Init(name, canonical, retloc,
+                    (flags & wxLOCALE_LOAD_DEFAULT) != 0,
+                    (flags & wxLOCALE_CONV_ENCODING) != 0);
+    if (szLocale)
+        free(szLocale);
+    return ret;
 }