Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

Browse Source 
2007-08-14  Cody Russell  <bratsche@gnome.org>

	Merge from trunk:

        * gtk/gtkwidget.c
        * gtk/gtkscrolledwindow.c
        * gtk/gtklabel.c: Correct documentation that refers to the
        deprecated gtk_widget_set_usize() API.  Refer instead to
        gtk_widget_set_size_request().  (#459340, Guillaume Cottenceau)


svn path=/branches/gtk-2-10/; revision=18614
This commit is contained in:
Cody Russell
2007-08-14 22:46:25 +00:00
committed by Cody Russell
parent 7a2440bc98
commit 1e1607b66f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtklabel.c
View File

@@ -2087,7 +2087,7 @@ gtk_label_size_request (GtkWidget *widget,
* If word wrapping is on, then the height requisition can depend
* on:
*
* - Any width set on the widget via gtk_widget_set_usize().
* - Any width set on the widget via gtk_widget_set_size_request().
* - The padding of the widget (xpad, set by gtk_misc_set_padding)
*
* Instead of trying to detect changes to these quantities, if we

4
gtk/gtkscrolledwindow.c
View File

@@ -43,9 +43,9 @@
* to be best suited to display its contents, including children.
* the width and/or height reported from a widget upon size requisition
* may be overidden by the user by specifying a width and/or height
* other than 0 through gtk_widget_set_usize().
* other than 0 through gtk_widget_set_size_request().
*
* a scrolled window needs (for imlementing all three policy types) to
* a scrolled window needs (for implementing all three policy types) to
* request its width and height based on two different rationales.
* 1) the user wants the scrolled window to just fit into the space
* that it gets allocated for a specifc dimension.

5
gtk/gtkwidget.c
View File

@@ -2887,8 +2887,9 @@ gtk_widget_size_request (GtkWidget *widget,
*
* This function is only for use in widget implementations. Obtains
* @widget->requisition, unless someone has forced a particular
* geometry on the widget (e.g. with gtk_widget_set_usize()), in which
* case it returns that geometry instead of the widget's requisition.
* geometry on the widget (e.g. with gtk_widget_set_size_request()),
* in which case it returns that geometry instead of the widget's
* requisition.
*
* This function differs from gtk_widget_size_request() in that
* it retrieves the last size request value from @widget->requisition,