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/color_edit_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/color_edit_dlg.c')
-rw-r--r-- | ui/gtk/color_edit_dlg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index a8770d187d..481f4e51ed 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -272,7 +272,7 @@ color_edit_dlg_new(GtkWidget *color_filters, /* 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_expr_cb), filt_text_entry); gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3); gtk_widget_set_tooltip_text(add_expression_bt, "Add an expression to the filter string"); |