diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-02 22:30:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-02 22:30:54 +0000 |
| commit | 0c2240ba379ceb5f3773171cc80a8c640f34e839 (patch) | |
| tree | 40a189258bbfd061ebb76bdb142d8a12dab718bb /gtk/gtkclist.c | |
| parent | 4e09f86e48c730c053bb524ca09173ce136c2084 (diff) | |
| download | gtk+-0c2240ba379ceb5f3773171cc80a8c640f34e839.tar.gz | |
Add a 'text' argument to set the initial text.
Sun Jul 2 18:19:50 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.[ch] (gtk_widget_create_pango_layout): Add a 'text' argument to
set the initial text.
* gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c
gtk/gtkentry.c gtk/gtkhruler.c gtk/gtkhscale.c gtk/gtklabel.c
gtk/gtkprogressbar.c gtk/gtkscale.c gtk/gtkvruler.c
gtk/gtkvscale.c: Adapt to new argument of create_pango_layout().
* gtk/gtkclist.c (_gtk_clist_create_cell_layout): Use new
pango_layout_set_font_description to simplify.
Diffstat (limited to 'gtk/gtkclist.c')
| -rw-r--r-- | gtk/gtkclist.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 0964c273c1..3eef07c79b 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2500,7 +2500,6 @@ _gtk_clist_create_cell_layout (GtkCList *clist, GtkCListRow *clist_row, gint column) { - PangoContext *context; PangoLayout *layout; GtkStyle *style; GtkCell *cell; @@ -2522,11 +2521,11 @@ _gtk_clist_create_cell_layout (GtkCList *clist, if (!text) return NULL; - layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist)); + layout = gtk_widget_create_pango_layout (GTK_WIDGET (clist), + ((cell->type == GTK_CELL_PIXTEXT) ? + GTK_CELL_PIXTEXT (*cell)->text : + GTK_CELL_TEXT (*cell)->text)); 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); return layout; |