diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-07-31 11:42:36 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-08-14 08:05:53 +0800 |
| commit | 3b82b97e7320c807fe5bc736e9a73eb4a339a135 (patch) | |
| tree | 503ac2c8cc56b11d824c51addc2e319341a2f0de /modules | |
| parent | 9072be16a4b5e5a800f6f3207f7c2531a366c6b6 (diff) | |
| download | gtk+-3b82b97e7320c807fe5bc736e9a73eb4a339a135.tar.gz | |
GTK-Win32: Avoid Using Deprecated API
Replace the deprecated API calls with the updated APIs, and fix the build
of modules/input/gtkimcontextime.c, as we really needed
gdk/gdkkeysyms-compat.h (gdk/gdkkeysyms.h was already included)
https://bugzilla.gnome.org/show_bug.cgi?id=705068
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/gtkimcontextime.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c index 0de1b53dae..aac572e989 100644 --- a/modules/input/gtkimcontextime.c +++ b/modules/input/gtkimcontextime.c @@ -31,7 +31,7 @@ #include "imm-extra.h" -#include <gdk/gdkkeysyms.h> +#include "gdk/gdkkeysyms-compat.h" #include "gdk/win32/gdkwin32.h" #include "gdk/gdkkeysyms.h" @@ -890,6 +890,8 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context) PangoContext *pango_context; PangoFont *font; LOGFONT *logfont; + GtkStyleContext *style; + PangoFontDescription *font_desc; g_return_if_fail (GTK_IS_IM_CONTEXT_IME (context)); @@ -941,6 +943,9 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context) default: lang = ""; break; } + + style = gtk_widget_get_style_context (widget); + gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); if (lang[0]) { @@ -949,9 +954,9 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context) */ PangoLanguage *pango_lang = pango_language_from_string (lang); PangoFontset *fontset = - pango_context_load_fontset (pango_context, - gtk_widget_get_style (widget)->font_desc, - pango_lang); + pango_context_load_fontset (pango_context, + font_desc, + pango_lang); gunichar *sample = g_utf8_to_ucs4 (pango_language_get_sample_string (pango_lang), -1, NULL, NULL, NULL); @@ -972,7 +977,7 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context) g_object_unref (fontset); } else - font = pango_context_load_font (pango_context, gtk_widget_get_style (widget)->font_desc); + font = pango_context_load_font (pango_context, font_desc); if (!font) goto ERROR_OUT; |