From 8fa3a431aff14825f36d6d481da900401524c871 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jul 2003 11:53:37 +0000 Subject: [PATCH] reverted gdk_fontset_load() change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index e1521328fc..2802d1170b 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -235,10 +235,13 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL; #elif defined(__WXGTK__) wxNativeFont wxLoadFont(const wxString& fontSpec) { - // use gdk_fontset_load() instead of gdk_font_load() because otherwise - // we have problems with Japanese (not terribly precise, I know, but - // this is all the patch said) - return gdk_fontset_load( wxConvertWX2MB(fontSpec) ); + // VZ: we should use gdk_fontset_load() instead of gdk_font_load() + // here to be able to display Japanese fonts correctly (at least + // this is what people report) but unfortunately doing it results + // 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) -- 2.45.2