callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolbutton: don't force the icon widget to be a GtkMisc

Browse Source 
There's really no reason the icon widget must be a GtkMisc. You might
want to use e.g. a GtkSpinner.
This commit is contained in:
Cosimo Cecchi
2011-09-27 17:06:59 -04:00
parent 63124e81b6
commit 5cf0450c69
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktoolbutton.c
View File

@ -972,9 +972,9 @@ gtk_tool_button_new_from_stock (const gchar *stock_id)
/** /**
* gtk_tool_button_new: * gtk_tool_button_new:
* @label: (allow-none): a string that will be used as label, or %NULL * @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. * label.
* *
* Return value: A new #GtkToolButton * Return value: A new #GtkToolButton
@ -987,7 +987,7 @@ gtk_tool_button_new (GtkWidget *icon_widget,
{ {
GtkToolButton *button; 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, button = g_object_new (GTK_TYPE_TOOL_BUTTON,
"label", label, "label", label,

6
tests/testtoolbar.c
View File

@ -680,6 +680,12 @@ main (gint argc, gchar **argv)
add_item_to_list (store, item, "Terminal"); add_item_to_list (store, item, "Terminal");
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 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); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (vbox), hbox);