]> git.saurik.com Git - wxWidgets.git/commitdiff
removed wxGTK2 hack, not needed any more
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 11 Apr 2006 01:37:36 +0000 (01:37 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 11 Apr 2006 01:37:36 +0000 (01:37 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/fontmap.cpp

index dca08069106ec88cb2d909cd5a048b6ef3479561..622e38279aab4ee7d8b278400bab189eb92df85a 100644 (file)
@@ -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,