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

reverted gdk_fontset_load() change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-20 11:53:37 +00:00
parent 1772d20c87
commit 8fa3a431af
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/unix/fontutil.cpp
View File

@@ -235,10 +235,13 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL;
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
wxNativeFont wxLoadFont(const wxString& fontSpec) wxNativeFont wxLoadFont(const wxString& fontSpec)
{ {
// use gdk_fontset_load() instead of gdk_font_load() because otherwise // VZ: we should use gdk_fontset_load() instead of gdk_font_load()
// we have problems with Japanese (not terribly precise, I know, but // here to be able to display Japanese fonts correctly (at least
// this is all the patch said) // this is what people report) but unfortunately doing it results
return gdk_fontset_load( wxConvertWX2MB(fontSpec) ); // in tons of warnings when using GTK with "normal" European
// languages and so we can't always do it and I don't know enough
// to determine when should this be done... (FIXME)
return gdk_font_load( wxConvertWX2MB(fontSpec) );
} }
inline void wxFreeFont(wxNativeFont font) inline void wxFreeFont(wxNativeFont font)