Commit 5fc33854 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

Merged from gtk-2-6:

2005-03-31  Sven Neumann  <sven@gimp.org>

	Merged from gtk-2-6:

	* gtk/gtkbutton.c
	* gtk/gtkiconview.c: fixed gtk-doc comments.
parent 9f553ec6
2005-03-31 Sven Neumann <sven@gimp.org>
Merged from gtk-2-6:
* gtk/gtkbutton.c
* gtk/gtkiconview.c: fixed gtk-doc comments.
2005-03-31 Michael Natterer <mitch@gimp.org>
Allow to pop up menus without grabbing the keyboard. Useful for
......
2005-03-31 Sven Neumann <sven@gimp.org>
Merged from gtk-2-6:
* gtk/gtkbutton.c
* gtk/gtkiconview.c: fixed gtk-doc comments.
2005-03-31 Michael Natterer <mitch@gimp.org>
Allow to pop up menus without grabbing the keyboard. Useful for
......
2005-03-31 Sven Neumann <sven@gimp.org>
Merged from gtk-2-6:
* gtk/gtkbutton.c
* gtk/gtkiconview.c: fixed gtk-doc comments.
2005-03-31 Michael Natterer <mitch@gimp.org>
Allow to pop up menus without grabbing the keyboard. Useful for
......
......@@ -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 *
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment