callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added gdk_text_extents_wc()

Browse Source 
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.
This commit is contained in:
Owen Taylor
1998-12-15 20:31:26 +00:00
committed by Owen Taylor
parent 7eec796cbd
commit a3c1e86ffa
26 changed files with 1155 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtknotebook.c
View File

@ -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);
}
}
}