Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed wxGTK2 hack, not needed any more

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-11 01:37:36 +00:00
parent 77c514d111
commit 4693d68648
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/fontmap.cpp
View File

@@ -494,12 +494,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
wxCHECK_MSG( encodingAlt, false, wxCHECK_MSG( encodingAlt, false,
_T("wxFontEncoding::GetAltForEncoding(): NULL pointer") ); _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; wxNativeEncodingInfo info;
if ( !GetAltForEncoding(encoding, &info, facename, interactive) ) if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
return false; return false;
@@ -507,7 +501,6 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
*encodingAlt = info.encoding; *encodingAlt = info.encoding;
return true; return true;
#endif // wxGTK2/!wxGTK2
} }
bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding, bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,