From 5fc338544b308212e2a6393d346d7850dc597682 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 31 Mar 2005 17:04:25 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-03-31 Sven Neumann Merged from gtk-2-6: * gtk/gtkbutton.c * gtk/gtkiconview.c: fixed gtk-doc comments. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkbutton.c | 2 ++ gtk/gtkiconview.c | 6 +++--- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d41547d3ac..53cb82ed47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-03-31 Sven Neumann + + Merged from gtk-2-6: + + * gtk/gtkbutton.c + * gtk/gtkiconview.c: fixed gtk-doc comments. + 2005-03-31 Michael Natterer Allow to pop up menus without grabbing the keyboard. Useful for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d41547d3ac..53cb82ed47 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-03-31 Sven Neumann + + Merged from gtk-2-6: + + * gtk/gtkbutton.c + * gtk/gtkiconview.c: fixed gtk-doc comments. + 2005-03-31 Michael Natterer Allow to pop up menus without grabbing the keyboard. Useful for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d41547d3ac..53cb82ed47 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-03-31 Sven Neumann + + Merged from gtk-2-6: + + * gtk/gtkbutton.c + * gtk/gtkiconview.c: fixed gtk-doc comments. + 2005-03-31 Michael Natterer Allow to pop up menus without grabbing the keyboard. Useful for diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index d9eedf18b5..8c5fe3755b 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1774,6 +1774,8 @@ gtk_button_set_image (GtkButton *button, * This may have been explicitly set by gtk_button_set_image() * or constructed by gtk_button_new_from_stock(). * + * Return value: a #GtkWidget or %NULL in case there is no image + * * Since: 2.6 */ GtkWidget * diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index e20ab3d044..d91bb01415 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -3809,7 +3809,7 @@ gtk_icon_view_get_item_width (GtkIconView *icon_view) /** - * gtk_icon_view_set_item_width: + * gtk_icon_view_set_spacing: * @icon_view: a #GtkIconView * @spacing: the spacing * @@ -3857,7 +3857,7 @@ gtk_icon_view_get_spacing (GtkIconView *icon_view) /** * gtk_icon_view_set_row_spacing: * @icon_view: a #GtkIconView - * @spacing: the row spacing + * @row_spacing: the row spacing * * Sets the ::row-spacing property which specifies the space * which is inserted between the rows of the icon view. @@ -3902,7 +3902,7 @@ gtk_icon_view_get_row_spacing (GtkIconView *icon_view) /** * gtk_icon_view_set_column_spacing: * @icon_view: a #GtkIconView - * @spacing: the column spacing + * @column_spacing: the column spacing * * Sets the ::column-spacing property which specifies the space * which is inserted between the columns of the icon view.