Migrate GTK icon handling to GTK 3.10 API

GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids.
We keep a stock id based approach but without relying on GTK's
GtkStockItem system.

We create our own internal stock ids for {icon, label} tuples and keep
the original GTK stock id #define-s and values to preserve backward
compatibility.

Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0
Reviewed-on: https://code.wireshark.org/review/302
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c
index 9ca2d08765..77929fd137 100644
--- a/ui/gtk/color_dlg.c
+++ b/ui/gtk/color_dlg.c
@@ -232,26 +232,26 @@ colorize_dialog_new (char *filter)
   gtk_container_set_border_width  (GTK_CONTAINER (edit_vbox), 5);
   gtk_container_add(GTK_CONTAINER(edit_fr), edit_vbox);
 
-  color_new = gtk_button_new_from_stock(GTK_STOCK_NEW);
+  color_new = ws_gtk_button_new_from_stock(GTK_STOCK_NEW);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_new, "Create a new filter at the top of the list");
 
-  color_edit = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
+  color_edit = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_edit, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_edit, " If more than one filter is selected, edit the first selected one");
   gtk_widget_set_sensitive (color_edit, FALSE);
 
-  color_enable = gtk_button_new_from_stock(WIRESHARK_STOCK_ENABLE);
+  color_enable = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_ENABLE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_enable, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_enable, "Enable the selected filter(s)");
   gtk_widget_set_sensitive (color_enable, FALSE);
 
-  color_disable = gtk_button_new_from_stock(WIRESHARK_STOCK_DISABLE);
+  color_disable = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_DISABLE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_disable, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_disable, "Disable the selected filter(s)");
   gtk_widget_set_sensitive (color_disable, FALSE);
 
-  color_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+  color_delete = ws_gtk_button_new_from_stock(GTK_STOCK_DELETE);
   gtk_box_pack_start (GTK_BOX (edit_vbox), color_delete, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_delete, "Delete the selected filter(s)");
   gtk_widget_set_sensitive (color_delete, FALSE);
@@ -266,13 +266,13 @@ colorize_dialog_new (char *filter)
   gtk_container_set_border_width  (GTK_CONTAINER (manage_vbox), 5);
   gtk_container_add(GTK_CONTAINER(manage_fr), manage_vbox);
 
-  color_import = gtk_button_new_from_stock(WIRESHARK_STOCK_IMPORT);
+  color_import = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_IMPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_import, "Load filters from a file and append them to the list");
-  color_export = gtk_button_new_from_stock(WIRESHARK_STOCK_EXPORT);
+  color_export = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_EXPORT);
   gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_export, "Save all/selected filters to a file");
-  color_clear = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+  color_clear = ws_gtk_button_new_from_stock(GTK_STOCK_CLEAR);
   gtk_box_pack_start(GTK_BOX (manage_vbox), color_clear, FALSE, FALSE, 5);
   gtk_widget_set_tooltip_text(color_clear, "Clear the filter list and revert to system-wide default filter set");
 
@@ -339,7 +339,7 @@ colorize_dialog_new (char *filter)
   gtk_container_set_border_width  (GTK_CONTAINER (order_vbox), 5);
   gtk_container_add(GTK_CONTAINER(order_fr), order_vbox);
 
-  color_filter_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
+  color_filter_up = ws_gtk_button_new_from_stock(GTK_STOCK_GO_UP);
   gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_up, FALSE, FALSE, 0);
   gtk_widget_set_tooltip_text(color_filter_up, "Move filter higher in list");
   gtk_widget_set_sensitive (color_filter_up, FALSE);
@@ -347,7 +347,7 @@ colorize_dialog_new (char *filter)
   order_move_label = gtk_label_new (("Move\nselected filter\nup or down"));
   gtk_box_pack_start (GTK_BOX (order_vbox), order_move_label, FALSE, FALSE, 0);
 
-  color_filter_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
+  color_filter_down = ws_gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
   gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_down, FALSE, FALSE, 0);
   gtk_widget_set_tooltip_text(color_filter_down, "Move filter lower in list");
   gtk_widget_set_sensitive (color_filter_down, FALSE);