[gtk+/gtk-3-2] toolbutton: don't force the icon widget to be a GtkMisc

[Matthias Clasen <matthiasc src gnome org>]

commit 1f23b40b3dcff5a72c2468614021fcb01172d984
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Sep 27 17:06:59 2011 -0400

    toolbutton: don't force the icon widget to be a GtkMisc
    
    There's really no reason the icon widget must be a GtkMisc. You might
    want to use e.g. a GtkSpinner.

 gtk/gtktoolbutton.c |    6 +++---
 tests/testtoolbar.c |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 8ee5fdf..934ca61 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -972,9 +972,9 @@ gtk_tool_button_new_from_stock (const gchar *stock_id)
 /**
  * gtk_tool_button_new:
  * @label: (allow-none): a string that will be used as label, or %NULL
- * @icon_widget: (allow-none): a #GtkMisc widget that will be used as icon widget, or %NULL
+ * @icon_widget: (allow-none): a widget that will be used as the button contents, or %NULL
  *
- * Creates a new %GtkToolButton using @icon_widget as icon and @label as
+ * Creates a new %GtkToolButton using @icon_widget as contents and @label as
  * label.
  *
  * Return value: A new #GtkToolButton
@@ -987,7 +987,7 @@ gtk_tool_button_new (GtkWidget	 *icon_widget,
 {
   GtkToolButton *button;
 
-  g_return_val_if_fail (icon_widget == NULL || GTK_IS_MISC (icon_widget), NULL);
+  g_return_val_if_fail (icon_widget == NULL || GTK_IS_WIDGET (icon_widget), NULL);
 
   button = g_object_new (GTK_TYPE_TOOL_BUTTON,
                          "label", label,
diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index 38056cd..310e700 100644
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -683,6 +683,12 @@ main (gint argc, gchar **argv)
   add_item_to_list (store, item, "Terminal");
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
+  image = gtk_spinner_new ();
+  gtk_spinner_start (GTK_SPINNER (image));
+  item = gtk_tool_button_new (image, "Spinner");
+  add_item_to_list (store, item, "Spinner");
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
   gtk_table_attach (GTK_TABLE (table), hbox,