From 4e09f86e48c730c053bb524ca09173ce136c2084 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 2 Jul 2000 22:09:13 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkclist.c | 8 ++------ 8 files changed, 37 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0caeb9b9fe..2026ddbab2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jul 2 17:43:41 2000 Owen Taylor + + * gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new + pango_layout_set_font_description to simplify. + Sun Jul 2 17:06:40 2000 Owen Taylor * gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkctree.c gtk/gtkhscale.c diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index a575d4100e..0964c273c1 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2522,16 +2522,12 @@ _gtk_clist_create_cell_layout (GtkCList *clist, if (!text) return NULL; - context = gtk_widget_create_pango_context (GTK_WIDGET (clist)); - pango_context_set_font_description (context, style->font_desc); - - layout = pango_layout_new (context); + layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist)); + pango_layout_set_font_description (layout, style->font_desc); pango_layout_set_text (layout, ((cell->type == GTK_CELL_PIXTEXT) ? GTK_CELL_PIXTEXT (*cell)->text : GTK_CELL_TEXT (*cell)->text), -1); - g_object_unref (G_OBJECT (context)); - return layout; default: