From 030c0beade81092da145abc94b2750cd11a3be0b Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 3 Jun 2001 16:19:17 +0000
Subject: [PATCH] fixed stupid memory leak

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/intl.cpp | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 3b0a992d89..6c376a95a6 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -51,6 +51,8 @@
 #include "wx/file.h"
 #include "wx/tokenzr.h"
 #include "wx/module.h"
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
 
 #ifdef __WIN32__
     #include "wx/msw/private.h"
@@ -506,15 +508,8 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
   return NULL;
 }
 
-
-#if wxUSE_GUI
-#include "wx/fontmap.h"
-#include "wx/encconv.h"
-#endif
-
 void wxMsgCatalog::ConvertEncoding()
 {
-#if wxUSE_GUI
     wxFontEncoding enc;
 
     // first, find encoding header:
@@ -537,19 +532,7 @@ void wxMsgCatalog::ConvertEncoding()
     if ( enc == wxFONTENCODING_SYSTEM )
         return; // unknown encoding
 
-    wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
-#ifdef __UNIX__
-    wxString langFull;
-    if (wxGetEnv(wxT("LC_ALL"), &langFull) ||
-        wxGetEnv(wxT("LC_CTYPE"), &langFull) ||
-        wxGetEnv(wxT("LANG"), &langFull))
-    {
-        wxString lcharset = langFull.AfterFirst(wxT('.')).BeforeFirst(wxT('@'));
-        if (!lcharset.IsEmpty())
-            targetEnc = wxTheFontMapper->CharsetToEncoding(lcharset, FALSE);
-    }
-#endif
-
+    wxFontEncoding targetEnc = wxLocale::GetSystemEncoding();
     if (targetEnc == wxFONTENCODING_SYSTEM)
     {
         wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
@@ -565,7 +548,6 @@ void wxMsgCatalog::ConvertEncoding()
 
     for (size_t i = 0; i < m_numStrings; i++)
         converter.Convert((char*)StringAtOfs(m_pTransTable, i));
-#endif // wxUSE_GUI
 }
 
 
@@ -962,6 +944,7 @@ wxString wxLocale::GetSystemEncodingName()
     setlocale(LC_CTYPE, "");
     char *alang = nl_langinfo(CODESET);
     setlocale(LC_CTYPE, oldLocale);
+    free(oldLocale);
     if (alang)
     {
         encname = wxConvLibc.cMB2WX(alang);
-- 
2.47.2