diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-12-15 20:31:26 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-15 20:31:26 +0000 |
| commit | a3c1e86ffa9b75d4e027843d6c3d23249247cad5 (patch) | |
| tree | 2bf8312bde174405ce5ba3937a389a2ec4856927 /gtk/gtkfontsel.c | |
| parent | 7eec796cbdddddb2b1213dbf90c0609ef65a99a6 (diff) | |
| download | gtk+-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/gtkfontsel.c')
| -rw-r--r-- | gtk/gtkfontsel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 926bd95124..5491697914 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1752,19 +1752,19 @@ gtk_font_selection_load_font (GtkFontSelection *fontsel) it's necessary as it results in a resize of the whole window! */ gtk_label_get(GTK_LABEL(fontsel->message_label), &label_text); if (strcmp(label_text, "")) - gtk_label_set(GTK_LABEL(fontsel->message_label), ""); + gtk_label_set_text(GTK_LABEL(fontsel->message_label), ""); gtk_font_selection_update_preview (fontsel); return TRUE; } else { - gtk_label_set(GTK_LABEL(fontsel->message_label), + gtk_label_set_text(GTK_LABEL(fontsel->message_label), "The selected font is not available."); } } else { - gtk_label_set(GTK_LABEL(fontsel->message_label), + gtk_label_set_text(GTK_LABEL(fontsel->message_label), "The selected font is not a valid font."); } @@ -1822,7 +1822,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel) displayed properly. */ xfs = GDK_FONT_XFONT(fontsel->font); if (xfs->min_byte1 != 0 || xfs->max_byte1 != 0) - gtk_label_set(GTK_LABEL(fontsel->message_label), + gtk_label_set_text(GTK_LABEL(fontsel->message_label), "This is a 2-byte font and may not be displayed correctly."); } @@ -2135,12 +2135,12 @@ gtk_font_selection_update_filter (GtkFontSelection *fontsel) if (default_filter) { gtk_widget_set_sensitive(fontsel->filter_button, FALSE); - gtk_label_set(GTK_LABEL(fontsel->font_label), "Font:"); + gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font:"); } else { gtk_widget_set_sensitive(fontsel->filter_button, TRUE); - gtk_label_set(GTK_LABEL(fontsel->font_label), "Font: (Filter Applied)"); + gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font: (Filter Applied)"); } gtk_font_selection_show_available_fonts(fontsel); } @@ -2365,7 +2365,7 @@ gtk_font_selection_clear_filter (GtkFontSelection *fontsel) /* Update the main notebook page. */ gtk_widget_set_sensitive(fontsel->filter_button, FALSE); - gtk_label_set(GTK_LABEL(fontsel->font_label), "Font:"); + gtk_label_set_text(GTK_LABEL(fontsel->font_label), "Font:"); gtk_font_selection_show_available_fonts(fontsel); } |