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

removed (ugly) workarounds unneeded any more because of 1.23.2.3 change in wx/buffer.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-30 22:19:24 +00:00
parent 748b03e9c0
commit ebf126595a
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/intl.cpp
View File

@@ -676,37 +676,38 @@ bool wxLocale::Init(int language, int flags)
wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
if ((const wxChar*)retloc == NULL)
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, locale.Mid(0,2));
retloc = tmp;
retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
}
if ((const wxChar*)retloc == NULL)
if ( !retloc )
{
// Some C libraries (namely glibc) still use old ISO 639,
// so will translate the abbrev for them
wxString mid = locale.Mid(0,2);
if (mid == wxT("he")) locale = wxT("iw") + locale.Mid(3);
else if (mid == wxT("id")) locale = wxT("in") + locale.Mid(3);
else if (mid == wxT("yi")) locale = wxT("ji") + locale.Mid(3);
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, locale);
retloc = tmp;
if (mid == wxT("he"))
locale = wxT("iw") + locale.Mid(3);
else if (mid == wxT("id"))
locale = wxT("in") + locale.Mid(3);
else if (mid == wxT("yi"))
locale = wxT("ji") + locale.Mid(3);
retloc = wxSetlocale(LC_ALL, locale);
}
if ((const wxChar*)retloc == NULL)
if ( !retloc )
{
// (This time, we changed locale in previous if-branch, so try again.)
// Some C libraries don't like xx_YY form and require xx only
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, locale.Mid(0,2));
retloc = tmp;
retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
}
if ((const wxChar*)retloc == NULL)
if ( !retloc )
{
wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
return FALSE;
}
#elif defined(__WIN32__)
wxMB2WXbuf retloc(wxT("C"));
wxMB2WXbuf retloc = wxT("C");
if (language != wxLANGUAGE_DEFAULT)
{
if (info->WinLang == 0)
@@ -720,8 +721,7 @@ bool wxLocale::Init(int language, int flags)
SORT_DEFAULT);
if (SetThreadLocale(lcid))
{
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, wxEmptyString));
retloc = tmp;
retloc = wxSetlocale(LC_ALL, wxEmptyString);
}
else
{
@@ -745,19 +745,17 @@ bool wxLocale::Init(int language, int flags)
}
else
{
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, locale));
retloc = tmp;
retloc = wxSetlocale(LC_ALL, locale);
}
}
}
}
else
{
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, wxEmptyString));
retloc = tmp;
retloc = wxSetlocale(LC_ALL, wxEmptyString);
}
if ((const wxChar*)retloc == NULL)
if ( !retloc )
{
wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
return FALSE;