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

Defer retrieval of LANG env var, too. No memory management

Browse Source 
or conversion is now performed in wxCSConv constructor.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-17 23:01:48 +00:00
parent 551df6f246
commit 6cf7c00f3b
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/string.cpp
View File

@@ -2021,6 +2021,7 @@ static void wxLoadCharacterSets(void)
static wxCharacterSet *wxFindCharacterSet(const wxChar *charset) static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)
{ {
if (!charset) return (wxCharacterSet *)NULL;
wxLoadCharacterSets(); wxLoadCharacterSets();
for (size_t n=0; n<wxCharsets.GetCount(); n++) for (size_t n=0; n<wxCharsets.GetCount(); n++)
if (wxCharsets[n].names.Index(charset) != wxNOT_FOUND) if (wxCharsets[n].names.Index(charset) != wxNOT_FOUND)
@@ -2032,15 +2033,19 @@ WXDLLEXPORT_DATA(wxCSConv) wxConv_local((const wxChar *)NULL);
wxCSConv::wxCSConv(const wxChar *charset) wxCSConv::wxCSConv(const wxChar *charset)
{ {
if (!charset) { m_name = (wxChar *) NULL;
#ifdef __UNIX__
wxChar *lang = wxGetenv(_T("LANG"));
wxChar *dot = lang ? wxStrchr(lang, _T('.')) : (wxChar *)NULL;
if (dot) charset = dot+1;
#endif
}
m_cset = (wxCharacterSet *) NULL; m_cset = (wxCharacterSet *) NULL;
m_deferred = FALSE; m_deferred = TRUE;
SetName(charset);
}
wxCSConv::~wxCSConv()
{
if (m_name) free(m_name);
}
void wxCSConv::SetName(const wxChar *charset)
{
if (charset) { if (charset) {
#ifdef __UNIX__ #ifdef __UNIX__
// first, convert the character set name to standard form // first, convert the character set name to standard form
@@ -2065,15 +2070,17 @@ wxCSConv::wxCSConv(const wxChar *charset)
} }
} }
wxCSConv::~wxCSConv()
{
free(m_name);
}
void wxCSConv::LoadNow() void wxCSConv::LoadNow()
{ {
// wxPrintf(_T("Conversion request\n")); // wxPrintf(_T("Conversion request\n"));
if (m_deferred) { if (m_deferred) {
if (!m_name) {
#ifdef __UNIX__
wxChar *lang = wxGetenv(_T("LANG"));
wxChar *dot = lang ? wxStrchr(lang, _T('.')) : (wxChar *)NULL;
if (dot) SetName(dot+1);
#endif
}
m_cset = wxFindCharacterSet(m_name); m_cset = wxFindCharacterSet(m_name);
m_deferred = FALSE; m_deferred = FALSE;
} }