From 671b3b0eb06ede434e5e64ff77e7444634cb59a1 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Tue, 26 Jun 2001 15:15:00 +0000
Subject: Use new pango_context_get_metrics() to fix problems with font lists
 in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tue Jun 26 11:06:34 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
	Use new pango_context_get_metrics() to fix problems
	with font lists in descriptions. (#56184, reported by
	Jonas Borgström)
---
 gtk/gtkclist.c      | 10 ++++------
 gtk/gtkentry.c      | 13 ++++---------
 gtk/gtkspinbutton.c | 11 ++++-------
 3 files changed, 12 insertions(+), 22 deletions(-)

(limited to 'gtk')

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 76581eb1a3..653783417e 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -3026,13 +3026,11 @@ gtk_clist_set_row_height (GtkCList *clist,
     {
       PangoContext *context = gtk_widget_get_pango_context (widget);
       PangoFontMetrics metrics;
-      PangoFont *font = pango_context_load_font (context, widget->style->font_desc);
 
-      pango_font_get_metrics (font,
-			      pango_context_get_language (context),
-			      &metrics);
-      
-      g_object_unref (G_OBJECT (font));
+      pango_context_get_metrics (context,
+				 widget->style->font_desc,
+				 pango_context_get_language (context),
+				 &metrics);
       
       if (!GTK_CLIST_ROW_HEIGHT_SET(clist))
 	clist->row_height = PANGO_PIXELS (metrics.ascent + metrics.descent);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 6cdaf71e29..7a0753acd3 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1035,7 +1035,6 @@ gtk_entry_size_request (GtkWidget      *widget,
 {
   GtkEntry *entry;
   PangoFontMetrics metrics;
-  PangoFont *font;
   gint xborder, yborder;
   PangoContext *context;
   
@@ -1045,15 +1044,11 @@ gtk_entry_size_request (GtkWidget      *widget,
 
   entry = GTK_ENTRY (widget);
   
-  /* hackish for now, get metrics
-   */
   context = gtk_widget_get_pango_context (widget);
-  font = pango_context_load_font (context, widget->style->font_desc);
-  pango_font_get_metrics (font,
-			  pango_context_get_language (context),
-			  &metrics);
-  
-  g_object_unref (G_OBJECT (font));
+  pango_context_get_metrics (context,
+			     widget->style->font_desc,
+			     pango_context_get_language (context),
+			     &metrics);
 
   entry->ascent = metrics.ascent;
   entry->descent = metrics.descent;
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index efbfdfc717..324aa87504 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -569,18 +569,15 @@ gtk_spin_button_size_request (GtkWidget      *widget,
     {
       PangoContext *context;
       PangoFontMetrics metrics;
-      PangoFont *font;
       gint width;
       gint w;
       int string_len;
 
       context = gtk_widget_get_pango_context (widget);
-      font = pango_context_load_font (context,
-                                      widget->style->font_desc);
-      pango_font_get_metrics (font,
-			      pango_context_get_language (context),
-			      &metrics);
-      g_object_unref (G_OBJECT (font));
+      pango_context_get_metrics (context,
+				 widget->style->font_desc,
+				 pango_context_get_language (context),
+				 &metrics);
       
       /* Get max of MIN_SPIN_BUTTON_WIDTH, size of upper, size of lower */
       
-- 
cgit v1.2.1