diff options
author | Balint Reczey <balint@balintreczey.hu> | 2014-02-21 14:09:52 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-03-11 05:38:01 +0000 |
commit | 00be1d31ce580a6ad7ac37cb04d2dea9f20fa130 (patch) | |
tree | a69559baba8eda15963dba0f0bd37cc134e15ad4 /ui/gtk/prefs_column.c | |
parent | 234ab5b7632f03e8cdc3ad28f8bc22a00c2978d6 (diff) | |
download | wireshark-00be1d31ce580a6ad7ac37cb04d2dea9f20fa130.tar.gz |
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>
Diffstat (limited to 'ui/gtk/prefs_column.c')
-rw-r--r-- | ui/gtk/prefs_column.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c index 75af784308..474092a674 100644 --- a/ui/gtk/prefs_column.c +++ b/ui/gtk/prefs_column.c @@ -43,6 +43,7 @@ #include "ui/gtk/filter_dlg.h" #include "ui/gtk/filter_autocomplete.h" #include "ui/gtk/old-gtk-compat.h" +#include "ui/gtk/stock_icons.h" static GtkWidget *remove_bt, *field_te, *field_lb, *occurrence_te, *occurrence_lb, *fmt_cmb; static gulong column_menu_changed_handler_id; @@ -218,13 +219,13 @@ column_prefs_show(GtkWidget *prefs_window) { gtk_box_pack_start (GTK_BOX (bottom_hb), add_remove_vb, FALSE, FALSE, 0); gtk_widget_show(add_remove_vb); - add_bt = gtk_button_new_from_stock(GTK_STOCK_ADD); + add_bt = ws_gtk_button_new_from_stock(GTK_STOCK_ADD); g_signal_connect(add_bt, "clicked", G_CALLBACK(column_list_new_cb), column_l); gtk_box_pack_start (GTK_BOX (add_remove_vb), add_bt, FALSE, FALSE, 0); gtk_widget_set_tooltip_text(add_bt, "Add a new column at the end of the list."); gtk_widget_show(add_bt); - remove_bt = gtk_button_new_from_stock(GTK_STOCK_REMOVE); + remove_bt = ws_gtk_button_new_from_stock(GTK_STOCK_REMOVE); gtk_widget_set_sensitive(remove_bt, FALSE); g_signal_connect(remove_bt, "clicked", G_CALLBACK(column_list_delete_cb), column_l); gtk_box_pack_start (GTK_BOX (add_remove_vb), remove_bt, FALSE, FALSE, 0); |