AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

s/maximal/maximum/g (#161195, David Lodge)

Browse Source 
2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c: s/maximal/maximum/g  (#161195, David Lodge)
This commit is contained in:
Matthias Clasen 2004-12-13 20:41:19 +00:00 committed by Matthias Clasen
parent 6facd3109d
commit dcfcfe73b2
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: s/maximal/maximum/g (#161195, David Lodge)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
the reverted change, since it is necessary to prevent lost the reverted change, since it is necessary to prevent lost
submenus. But make it work for torn-off menus as well. submenus. But make it work for torn-off menus as well.

2
ChangeLog.pre-2-10
View File

@ -1,5 +1,7 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: s/maximal/maximum/g (#161195, David Lodge)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
the reverted change, since it is necessary to prevent lost the reverted change, since it is necessary to prevent lost
submenus. But make it work for torn-off menus as well. submenus. But make it work for torn-off menus as well.

2
ChangeLog.pre-2-6
View File

@ -1,5 +1,7 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: s/maximal/maximum/g (#161195, David Lodge)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
the reverted change, since it is necessary to prevent lost the reverted change, since it is necessary to prevent lost
submenus. But make it work for torn-off menus as well. submenus. But make it work for torn-off menus as well.

2
ChangeLog.pre-2-8
View File

@ -1,5 +1,7 @@
2004-12-13 Matthias Clasen <mclasen@redhat.com> 2004-12-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c: s/maximal/maximum/g (#161195, David Lodge)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Reintroduce
the reverted change, since it is necessary to prevent lost the reverted change, since it is necessary to prevent lost
submenus. But make it work for torn-off menus as well. submenus. But make it work for torn-off menus as well.

14
gtk/gtklabel.c
View File

@ -499,7 +499,7 @@ gtk_label_class_init (GtkLabelClass *class)
/** /**
* GtkLabel:max-width-chars: * GtkLabel:max-width-chars:
* *
* The desired width maximal of the label, in characters. If this property * The desired maximum width of the label, in characters. If this property
* is set to -1, the width will be calculated automatically, otherwise the * is set to -1, the width will be calculated automatically, otherwise the
* label will request space for no more than the requested number of * label will request space for no more than the requested number of
* characters. If the width-chars property is set to a positive value, * characters. If the width-chars property is set to a positive value,
@ -510,8 +510,8 @@ gtk_label_class_init (GtkLabelClass *class)
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MAX_WIDTH_CHARS, PROP_MAX_WIDTH_CHARS,
g_param_spec_int ("max_width_chars", g_param_spec_int ("max_width_chars",
P_("Maximal Width In Characters"), P_("Maximum Width In Characters"),
P_("The desired maximal width of the label, in characters"), P_("The desired maximum width of the label, in characters"),
-1, -1,
G_MAXINT, G_MAXINT,
-1, -1,
@ -1579,9 +1579,9 @@ gtk_label_get_width_chars (GtkLabel *label)
/** /**
* gtk_label_set_max_width_chars: * gtk_label_set_max_width_chars:
* @label: a #GtkLabel * @label: a #GtkLabel
* @n_chars: the new desired maximal width, in characters. * @n_chars: the new desired maximum width, in characters.
* *
* Sets the desired maximal width in characters of @label to @n_chars. * Sets the desired maximum width in characters of @label to @n_chars.
* *
* Since: 2.6 * Since: 2.6
**/ **/
@ -1608,10 +1608,10 @@ gtk_label_set_max_width_chars (GtkLabel *label,
* gtk_label_get_max_width_chars: * gtk_label_get_max_width_chars:
* @label: a #GtkLabel * @label: a #GtkLabel
* *
* Retrieves the desired maximal width of @label, in characters. See * Retrieves the desired maximum width of @label, in characters. See
* gtk_label_set_width_chars(). * gtk_label_set_width_chars().
* *
* Return value: the maximal width of the label in characters. * Return value: the maximum width of the label in characters.
* *
* Since: 2.6 * Since: 2.6
**/ **/