Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed stupid memory leak

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-06-03 16:19:17 +00:00
parent c36f02449b
commit 030c0beade
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/intl.cpp
View File

@@ -51,6 +51,8 @@
#include "wx/file.h" #include "wx/file.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/module.h" #include "wx/module.h"
#include "wx/fontmap.h"
#include "wx/encconv.h"
#ifdef __WIN32__ #ifdef __WIN32__
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -506,15 +508,8 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
return NULL; return NULL;
} }
#if wxUSE_GUI
#include "wx/fontmap.h"
#include "wx/encconv.h"
#endif
void wxMsgCatalog::ConvertEncoding() void wxMsgCatalog::ConvertEncoding()
{ {
#if wxUSE_GUI
wxFontEncoding enc; wxFontEncoding enc;
// first, find encoding header: // first, find encoding header:
@@ -537,19 +532,7 @@ void wxMsgCatalog::ConvertEncoding()
if ( enc == wxFONTENCODING_SYSTEM ) if ( enc == wxFONTENCODING_SYSTEM )
return; // unknown encoding return; // unknown encoding
wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM; wxFontEncoding targetEnc = wxLocale::GetSystemEncoding();
#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
if (targetEnc == wxFONTENCODING_SYSTEM) if (targetEnc == wxFONTENCODING_SYSTEM)
{ {
wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc); wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
@@ -565,7 +548,6 @@ void wxMsgCatalog::ConvertEncoding()
for (size_t i = 0; i < m_numStrings; i++) for (size_t i = 0; i < m_numStrings; i++)
converter.Convert((char*)StringAtOfs(m_pTransTable, i)); converter.Convert((char*)StringAtOfs(m_pTransTable, i));
#endif // wxUSE_GUI
} }
@@ -962,6 +944,7 @@ wxString wxLocale::GetSystemEncodingName()
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
char *alang = nl_langinfo(CODESET); char *alang = nl_langinfo(CODESET);
setlocale(LC_CTYPE, oldLocale); setlocale(LC_CTYPE, oldLocale);
free(oldLocale);
if (alang) if (alang)
{ {
encname = wxConvLibc.cMB2WX(alang); encname = wxConvLibc.cMB2WX(alang);