don't force UTF-8 encoding to ISO-8859-1 for GTK+ 2, it may have been necessary for GTK+ 1 but definitely not 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-22 11:05:03 +00:00
parent 63a8f2d351
commit 13f095d26d

View File

@@ -2451,9 +2451,10 @@ wxFontEncoding wxLocale::GetSystemEncoding()
wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname);
// 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
// is UTF8 -- but it isn't supported by wxGTK1 in ANSI build at all so
// don't even try to use it in this case
#if !wxUSE_UNICODE && (defined(__WXGTK__) || defined(__WXMOTIF__))
#if !wxUSE_UNICODE && \
((defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__WXMOTIF__))
if ( enc == wxFONTENCODING_UTF8 )
{
// the most similar supported encoding...