[gtk+] widget: Use gdk_pango_get_for_display
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] widget: Use gdk_pango_get_for_display
- Date: Mon, 18 Apr 2016 11:09:36 +0000 (UTC)
commit 921c154e386698eb83e06d87823ce1b25ab5d779
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Mar 31 21:35:43 2016 -0400
widget: Use gdk_pango_get_for_display
gtk/gtkwidget.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 0a29c48..1e87e10 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -10459,22 +10459,13 @@ gtk_widget_get_font_map (GtkWidget *widget)
PangoContext *
gtk_widget_create_pango_context (GtkWidget *widget)
{
- GdkScreen *screen;
+ GdkDisplay *display;
PangoContext *context;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
- screen = gtk_widget_get_screen_unchecked (widget);
- if (!screen)
- {
- GTK_NOTE (MULTIHEAD,
- g_warning ("gtk_widget_create_pango_context () called without screen"));
-
- screen = gdk_screen_get_default ();
- }
-
- context = gdk_pango_context_get_for_screen (screen);
-
+ display = gtk_widget_get_display (widget);
+ context = gdk_pango_context_get_for_display (display);
update_pango_context (widget, context);
pango_context_set_language (context, gtk_get_default_language ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]