Merge from trunk:

2007-08-15  Cody Russell  <bratsche@gnome.org>

	Merge from trunk:

        * gtk/gtkcontainer.c: Another documentation fix that I forgot to
        commit yesterday.  (#459340, Guillaume Cottenceau)


svn path=/branches/gtk-2-10/; revision=18620
This commit is contained in:
Cody Russell
2007-08-15 14:52:11 +00:00
committed by Cody Russell
parent 1e1607b66f
commit f0a55b2889
2 changed files with 20 additions and 2 deletions

View File

@@ -1,3 +1,20 @@
2007-08-15 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* gtk/gtkcontainer.c: Another documentation fix that I forgot to
commit yesterday. (#459340, Guillaume Cottenceau)
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)
2007-08-09 Sven Neumann <sven@gimp.org>
* modules/printbackends/file/gtkprintbackendfile.c: change the

View File

@@ -888,8 +888,9 @@ gtk_container_get_property (GObject *object,
* #GtkWindow; because toplevel windows can't leave space outside,
* they leave the space inside. The border is added on all sides of
* the container. To add space to only one side, one approach is to
* create a #GtkAlignment widget, call gtk_widget_set_usize() to give
* it a size, and place it on the side of the container as a spacer.
* create a #GtkAlignment widget, call gtk_widget_set_size_request()
* to give it a size, and place it on the side of the container as
* a spacer.
**/
void
gtk_container_set_border_width (GtkContainer *container,