AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 03:10:09 +00:00
Code Issues Projects Releases Wiki Activity

image: Don't take icon size in set_from_definition()

Browse Source
This commit is contained in:
Benjamin Otte 2017-01-24 03:14:53 +01:00 committed by Matthias Clasen
parent 67268bcc23
commit e5da85631a
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkdnd.c
View File

@ -1588,7 +1588,7 @@ set_icon_helper (GdkDragContext *context,
widget = gtk_image_new ();
gtk_widget_show (widget);
gtk_image_set_from_definition (GTK_IMAGE (widget), def, GTK_ICON_SIZE_DND);
gtk_image_set_from_definition (GTK_IMAGE (widget), def);
gtk_drag_set_icon_widget_internal (context, widget, hot_x, hot_y, TRUE);
}

5
gtk/gtkimage.c
View File

@ -1193,8 +1193,7 @@ gtk_image_notify_for_storage_type (GtkImage *image,
void
gtk_image_set_from_definition (GtkImage *image,
GtkImageDefinition *def,
GtkIconSize icon_size)
GtkImageDefinition *def)
{
GtkImagePrivate *priv = gtk_image_get_instance_private (image);
@ -1211,8 +1210,6 @@ gtk_image_set_from_definition (GtkImage *image,
gtk_image_notify_for_storage_type (image, gtk_image_definition_get_storage_type (def));
}
_gtk_icon_helper_set_icon_size (&priv->icon_helper, icon_size);
g_object_thaw_notify (G_OBJECT (image));
}

3
gtk/gtkimageprivate.h
View File

@ -33,8 +33,7 @@
G_BEGIN_DECLS
void gtk_image_set_from_definition (GtkImage *image,
GtkImageDefinition *def,
GtkIconSize size);
GtkImageDefinition *def);
GtkImageDefinition * gtk_image_get_definition (GtkImage *image);