aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/prefs_filter_expressions.c
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2014-02-21 14:09:52 +0100
committerAnders Broman <a.broman58@gmail.com>2014-03-11 05:38:01 +0000
commit00be1d31ce580a6ad7ac37cb04d2dea9f20fa130 (patch)
treea69559baba8eda15963dba0f0bd37cc134e15ad4 /ui/gtk/prefs_filter_expressions.c
parent234ab5b7632f03e8cdc3ad28f8bc22a00c2978d6 (diff)
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_filter_expressions.c')
-rw-r--r--ui/gtk/prefs_filter_expressions.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c
index 25e7e91..8bd72f0 100644
--- a/ui/gtk/prefs_filter_expressions.c
+++ b/ui/gtk/prefs_filter_expressions.c
@@ -42,6 +42,7 @@
#include "ui/gtk/filter_expression_save_dlg.h"
#include "ui/gtk/prefs_filter_expressions.h"
#include "ui/gtk/old-gtk-compat.h"
+#include "ui/gtk/stock_icons.h"
static void filter_expressions_list_new_cb(GtkWidget *, gpointer);
static void filter_expressions_list_remove_cb(GtkWidget *, gpointer);
@@ -197,7 +198,7 @@ filter_expressions_prefs_show(void) {
gtk_box_pack_start(GTK_BOX(bottom_hb), add_remove_hb, FALSE, FALSE, 0);
gtk_widget_show(add_remove_hb);
- 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(filter_expressions_list_new_cb), column_l);
gtk_box_pack_start(GTK_BOX(add_remove_hb), add_bt, FALSE, FALSE, 0);
@@ -206,7 +207,7 @@ filter_expressions_prefs_show(void) {
gtk_widget_show(add_bt);
/* Remove button */
- remove_bt = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ remove_bt = ws_gtk_button_new_from_stock(GTK_STOCK_REMOVE);
g_signal_connect(remove_bt, "clicked",
G_CALLBACK(filter_expressions_list_remove_cb), column_l);
gtk_box_pack_start(GTK_BOX(add_remove_hb), remove_bt, FALSE, FALSE, 0);