From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 10 Apr 2006 22:26:36 +0000 (+0000)
Subject: all encodings are available in GTK+ 2 (because we always convert to UTF-8 anyhow)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d0311dd366ec8a138e66ecb4a0e4ee3455c8a12d

all encodings are available in GTK+ 2 (because we always convert to UTF-8 anyhow)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index c29cc1aaf0..80d01451cb 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -322,27 +322,12 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
+    // all encodings are available in GTK+ 2 because we translate text in any
+    // encoding to UTF-8 internally anyhow
     info->facename.clear();
+    info->encoding = encoding;
 
-    switch ( encoding )
-    {
-        // we *must* return true for default encodings as otherwise wxFontMapper
-        // considers that we can't load any font and aborts with wxLogFatalError!
-        case wxFONTENCODING_DEFAULT:
-        case wxFONTENCODING_SYSTEM:
-            info->encoding = wxFONTENCODING_SYSTEM;
-            return true;
-
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_UTF8:
-            // these are always supported by GTK+ 2
-            info->encoding = encoding;
-            return true;
-
-        default:
-            // everything else must be converted to UTF-8
-            return false;
-    }
+    return true;
 }
 
 #else // GTK+ 1.x