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.

1 files changed, 5 insertions, 11 deletions

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 254a5dd72e..b27ddb776c 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1835,9 +1835,7 @@ create_image (GtkWidget *widget)
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
-      pack_image (vbox, "Stock Warning Dialog",
-                  gtk_image_new_from_icon_name ("dialog-warning",
-                                                GTK_ICON_SIZE_DIALOG));
+      pack_image (vbox, "Stock Warning Dialog", gtk_image_new_from_icon_name ("dialog-warning"));
 
       pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) openfile);
       
@@ -2046,8 +2044,7 @@ create_menu (GdkDisplay *display, gint depth, gint length)
 
   group = NULL;
 
-  image = gtk_image_new_from_icon_name ("document-open",
-                                        GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("document-open");
   gtk_widget_show (image);
   menuitem = gtk_menu_item_new ();
   label = gtk_label_new ("Image Item");
@@ -2109,8 +2106,7 @@ create_table_menu (GdkDisplay *display, gint cols, gint rows)
   j++;
 
   /* now fill the items submenu */
-  image = gtk_image_new_from_icon_name ("help-broswer",
-                                        GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("help-broswer");
   gtk_widget_show (image);
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   menuitem = gtk_menu_item_new ();
@@ -2130,8 +2126,7 @@ create_table_menu (GdkDisplay *display, gint cols, gint rows)
   gtk_menu_attach (GTK_MENU (submenu), menuitem, 0, 1, 1, 2);
   gtk_widget_show (menuitem);
 
-  image = gtk_image_new_from_icon_name ("help-browser",
-                                        GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name ("help-browser");
   gtk_widget_show (image);
   menuitem = gtk_menu_item_new ();
   label = gtk_label_new ("Image");
@@ -2340,8 +2335,7 @@ create_menus (GtkWidget *widget)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
-      image = gtk_image_new_from_icon_name ("help-browser",
-                                            GTK_ICON_SIZE_MENU);
+      image = gtk_image_new_from_icon_name ("help-browser");
       gtk_widget_show (image);
       menuitem = gtk_menu_item_new ();
       label = gtk_label_new ("Help");