From 13f095d26dcaa2b7f7561d468d70aac7dfc208fe Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Aug 2006 11:05:03 +0000
Subject: [PATCH] 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
---
src/common/intl.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 2bb34b78cf..ad84ce7ba4 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -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...
--
2.47.2