From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 11 Apr 2006 01:37:36 +0000 (+0000)
Subject: removed wxGTK2 hack, not needed any more
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4693d68648fa027deeef41b13690fb6edccafab1

removed wxGTK2 hack, not needed any more


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

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index dca0806910..622e38279a 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -494,12 +494,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     wxCHECK_MSG( encodingAlt, false,
                     _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
 
-#ifdef __WXGTK20__
-    // in GTK+ 2 we can always use UTF-8 for everything so just do it,
-    // especially as no other font encodings are currently supported
-    *encodingAlt = wxFONTENCODING_UTF8;
-    return true;
-#else // !wxGTK2
     wxNativeEncodingInfo info;
     if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
         return false;
@@ -507,7 +501,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
     *encodingAlt = info.encoding;
 
     return true;
-#endif // wxGTK2/!wxGTK2
 }
 
 bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,