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/decode_as_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/decode_as_dlg.c')
| -rw-r--r-- | ui/gtk/decode_as_dlg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index 5dd4642bfa..afae7b7ffc 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -43,6 +43,7 @@ #include "ui/gtk/help_dlg.h" #include "ui/gtk/old-gtk-compat.h" #include "ui/gtk/packet_win.h" +#include "ui/gtk/stock_icons.h" #undef DEBUG @@ -1410,7 +1411,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) gtk_widget_set_tooltip_text(button, "Open a dialog showing the current settings.\n" "Note you need to select and press apply first to be able to save the current setting"); - button = gtk_button_new_from_stock(GTK_STOCK_CLEAR); + button = ws_gtk_button_new_from_stock(GTK_STOCK_CLEAR); g_signal_connect(button, "clicked", G_CALLBACK(decode_clear_cb), NULL); gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end(GTK_BOX(button_vb), button, FALSE, FALSE, 0); |