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/filter_dlg.c | |
| parent | 234ab5b7632f03e8cdc3ad28f8bc22a00c2978d6 (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/filter_dlg.c')
| -rw-r--r-- | ui/gtk/filter_dlg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index 52f0999650..9663c221bb 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -440,13 +440,13 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_container_add(GTK_CONTAINER(edit_fr), list_bb); gtk_widget_show(list_bb); - new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW); + new_bt = ws_gtk_button_new_from_stock(GTK_STOCK_NEW); g_signal_connect(new_bt, "clicked", G_CALLBACK(filter_new_bt_clicked_cb), filter_list_type_p); gtk_widget_show(new_bt); gtk_box_pack_start (GTK_BOX (list_bb), new_bt, FALSE, FALSE, 0); gtk_widget_set_tooltip_text(new_bt, "Create a new filter at the end of the list (with the current properties)"); - del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); + del_bt = ws_gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); g_signal_connect(del_bt, "clicked", G_CALLBACK(filter_del_bt_clicked_cb), filter_list_type_p); g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt); @@ -552,7 +552,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* Create the "Add Expression..." button, to pop up a dialog for constructing filter comparison expressions. */ - add_expression_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); + add_expression_bt = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); g_signal_connect(add_expression_bt, "clicked", G_CALLBACK(filter_add_expr_bt_cb), main_w); gtk_box_pack_start(GTK_BOX(bottom_hb), add_expression_bt, FALSE, FALSE, 0); gtk_widget_show(add_expression_bt); |