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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/common/intl.cpp
View File

@@ -506,7 +506,7 @@ wxString wxMsgCatalogFile::GetCharset() const
return wxEmptyString;
}
wxString header(StringAtOfs(m_pTransTable, 0));
wxString header = wxString::FromAscii( StringAtOfs(m_pTransTable, 0));
wxString charset;
int pos = header.Find(wxT("Content-Type: text/plain; charset="));
if ( pos == wxNOT_FOUND )
@@ -666,7 +666,6 @@ bool wxLocale::Init(int language, int flags)
wxString name = info->Description;
wxString canonical = info->CanonicalName;
wxString locale;
const wxChar *retloc;
// Set the locale:
#if defined(__UNIX__) && !defined(__WXMAC__)
@@ -675,48 +674,55 @@ bool wxLocale::Init(int language, int flags)
else
locale = info->CanonicalName;
retloc = wxSetlocale(LC_ALL, locale);
wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
if (retloc == NULL)
if ( !retloc )
{
// Some C libraries don't like xx_YY form and require xx only
retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
}
if (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);
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 (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
retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
}
if (retloc == NULL)
if ( !retloc )
{
wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
return FALSE;
}
#elif defined(__WIN32__)
wxMB2WXbuf retloc = wxT("C");
if (language != wxLANGUAGE_DEFAULT)
{
if (info->WinLang == 0)
{
wxLogWarning(wxT("Locale '%s' not supported by OS."), name.c_str());
retloc = wxT("C");
// retloc already set to "C"
}
else
{
wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
SORT_DEFAULT);
if (SetThreadLocale(lcid))
{
retloc = wxSetlocale(LC_ALL, wxEmptyString);
}
else
{
// Windows9X doesn't support SetThreadLocale, so we must
@@ -738,25 +744,29 @@ bool wxLocale::Init(int language, int flags)
return FALSE;
}
else
{
retloc = wxSetlocale(LC_ALL, locale);
}
}
}
}
else
{
retloc = wxSetlocale(LC_ALL, wxEmptyString);
}
if (retloc == NULL)
if ( !retloc )
{
wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
return FALSE;
}
#elif defined(__WXMAC__)
retloc = wxSetlocale(LC_ALL , wxEmptyString);
#elif defined(__WXMAC__) || defined(__WXPM__)
wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
#else
return FALSE;
#endif
return Init(name, canonical, wxString(retloc),
return Init(name, canonical, retloc,
(flags & wxLOCALE_LOAD_DEFAULT) != 0,
(flags & wxLOCALE_CONV_ENCODING) != 0);
}
@@ -1334,6 +1344,17 @@ wxFontEncoding wxLocale::GetSystemEncoding()
wxFontEncoding enc = wxFontMapper::Get()->
CharsetToEncoding(encname, FALSE /* not interactive */);
// on some modern Linux systems (RedHat 8) the default system locale
// is UTF8 -- but it isn't supported by wxGTK in ANSI build at all so
// don't even try to use it in this case
#if !wxUSE_UNICODE
if ( enc == wxFONTENCODING_UTF8 )
{
// the most similar supported encoding...
enc = wxFONTENCODING_ISO8859_1;
}
#endif // !wxUSE_UNICODE
// this should probably be considered as a bug in CharsetToEncoding():
// it shouldn't return wxFONTENCODING_DEFAULT at all - but it does it
// for US-ASCII charset
@@ -2095,7 +2116,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
#define LNG(wxlang, canonical, winlang, winsublang, desc) \
info.Language = wxlang; \
info.CanonicalName = wxT(canonical); \
info.Description = desc; \
info.Description = wxT(desc); \
SETWINLANG(info, winlang, winsublang) \
AddLanguage(info);
@@ -2151,7 +2172,7 @@ void wxLocale::InitLanguagesDB()
LNG(wxLANGUAGE_CHINESE_HONGKONG, "zh_HK", LANG_CHINESE , SUBLANG_CHINESE_HONGKONG , "Chinese (Hongkong)")
LNG(wxLANGUAGE_CHINESE_MACAU, "zh_MO", LANG_CHINESE , SUBLANG_CHINESE_MACAU , "Chinese (Macau)")
LNG(wxLANGUAGE_CHINESE_SINGAPORE, "zh_SG", LANG_CHINESE , SUBLANG_CHINESE_SINGAPORE , "Chinese (Singapore)")
LNG(wxLANGUAGE_CHINESE_TAIWAN, "zh_TW", 0 , 0 , "Chinese (Taiwan)")
LNG(wxLANGUAGE_CHINESE_TAIWAN, "zh_TW", LANG_CHINESE , SUBLANG_CHINESE_TRADITIONAL , "Chinese (Taiwan)")
LNG(wxLANGUAGE_CORSICAN, "co" , 0 , 0 , "Corsican")
LNG(wxLANGUAGE_CROATIAN, "hr_HR", LANG_CROATIAN , SUBLANG_DEFAULT , "Croatian")
LNG(wxLANGUAGE_CZECH, "cs_CZ", LANG_CZECH , SUBLANG_DEFAULT , "Czech")