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/gtklabel.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/gtklabel.c')
| -rw-r--r-- | gtk/gtklabel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 31e74abf60..21c08f8f5d 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -400,12 +400,11 @@ gtk_label_size_request (GtkWidget *widget, PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */ PangoAttrList *attrs = gtk_label_pattern_to_attrs (label); - label->layout = gtk_widget_create_pango_layout (widget); + label->layout = gtk_widget_create_pango_layout (widget, label->label); + pango_layout_set_attributes (label->layout, attrs); pango_attr_list_unref (attrs); - pango_layout_set_text (label->layout, label->label, -1); - switch (label->jtype) { case GTK_JUSTIFY_LEFT: |