summaryrefslogtreecommitdiff
path: root/gtk/gtknotebook.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-12-15 20:31:26 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-12-15 20:31:26 +0000
commita3c1e86ffa9b75d4e027843d6c3d23249247cad5 (patch)
tree2bf8312bde174405ce5ba3937a389a2ec4856927 /gtk/gtknotebook.c
parent7eec796cbdddddb2b1213dbf90c0609ef65a99a6 (diff)
downloadgdk-pixbuf-a3c1e86ffa9b75d4e027843d6c3d23249247cad5.tar.gz
Added gdk_text_extents_wc()
Tue Dec 15 14:30:35 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdk.h gdk/gdkfonts.c: Added gdk_text_extents_wc() * Patch from Jonathan Blanford <jrb@redhat.com> to add line wrapping to label. (Based on patch from Jeff Dairiki <dairiki@mac-ceope.apl.washington.edu> gtk-dairiki-971208-0) - Adds new function gtk_label_set_line_wrap() - implement GTK_JUSTIFY_FILL. - rename gtk_label_set to gtk_label_set_text() add gtk_label_set() to gtkcompat.h. * Use an internal wc representation in the label, so that we handle underlining and line breaks correctly for multi-byte strings.
Diffstat (limited to 'gtk/gtknotebook.c')
-rw-r--r--gtk/gtknotebook.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 6a749f2d5..eace09ef8 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1955,7 +1955,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
GTK_WIDGET (notebook));
}
else
- gtk_label_set (GTK_LABEL (page->tab_label), string);
+ gtk_label_set_text (GTK_LABEL (page->tab_label), string);
}
if (GTK_WIDGET_VISIBLE (page->child) &&
@@ -1968,10 +1968,10 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
if (notebook->menu && page->default_menu)
{
if (page->tab_label && GTK_IS_LABEL (page->tab_label))
- gtk_label_set (GTK_LABEL (page->menu_label),
+ gtk_label_set_text (GTK_LABEL (page->menu_label),
GTK_LABEL (page->tab_label)->label);
else
- gtk_label_set (GTK_LABEL (page->menu_label), string);
+ gtk_label_set_text (GTK_LABEL (page->menu_label), string);
}
}
}