Use new pango_context_get_metrics() to fix problems with font lists in

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)

10 files changed, 61 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 07d8094789..2c84366144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 07d8094789..2c84366144 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+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)
+
 Tue Jun 26 10:04:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkiconfactory.c:
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 */