summaryrefslogtreecommitdiff
path: root/gtk/gtktooltipwindow.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-11-14 19:43:13 -0500
committerMatthias Clasen <mclasen@redhat.com>2017-11-15 14:22:17 -0500
commitdbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b (patch)
treea76a5be1cac5ef746c431a00e8b79a93b63f3e10 /gtk/gtktooltipwindow.c
parent049cc6aa013601c4e662c38df408f8956b155f0a (diff)
downloadgtk+-dbfaa9910705a35d3017f1e8e65a9cf52e2f7d9b.tar.gz
image: Remove icon-size argument from icon setters
Instead, add a function gtk_image_set_icon_size() for the cases where overriding the icon size is necessary. Treat icon sizes the same way as pixel sizes, too. So gtk_image_clear() no longer unsets the icon size.
Diffstat (limited to 'gtk/gtktooltipwindow.c')
-rw-r--r--gtk/gtktooltipwindow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
index 6a8aa5221f..a83078217e 100644
--- a/gtk/gtktooltipwindow.c
+++ b/gtk/gtktooltipwindow.c
@@ -141,7 +141,7 @@ gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window,
{
if (icon_name)
{
- gtk_image_set_from_icon_name (GTK_IMAGE (window->image), icon_name, GTK_ICON_SIZE_MENU);
+ gtk_image_set_from_icon_name (GTK_IMAGE (window->image), icon_name);
gtk_widget_show (window->image);
}
else
@@ -156,7 +156,7 @@ gtk_tooltip_window_set_image_icon_from_gicon (GtkTooltipWindow *window,
{
if (gicon != NULL)
{
- gtk_image_set_from_gicon (GTK_IMAGE (window->image), gicon, GTK_ICON_SIZE_MENU);
+ gtk_image_set_from_gicon (GTK_IMAGE (window->image), gicon);
gtk_widget_show (window->image);
}
else