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/sctp_chunk_stat_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/sctp_chunk_stat_dlg.c')
-rw-r--r-- | ui/gtk/sctp_chunk_stat_dlg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index 1551ba460e..5bc03df5f5 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -36,6 +36,7 @@ #include "ui/gtk/main.h" #include "ui/tap-sctp-analysis.h" #include "ui/gtk/sctp_stat_gtk.h" +#include "ui/gtk/stock_icons.h" static GtkWidget *clist = NULL; static GList *last_list = NULL; @@ -635,7 +636,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) gtk_box_set_spacing(GTK_BOX (hbuttonbox2), 0); gtk_widget_show(hbuttonbox2); - bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + bt_close = ws_gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); gtk_widget_show (bt_close); @@ -762,7 +763,7 @@ sctp_chunk_dlg(struct sctp_udata *u_data) gtk_box_set_spacing(GTK_BOX (h_button_box), 0); gtk_widget_show(h_button_box); - close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + close_bt = ws_gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); g_signal_connect(close_bt, "clicked", G_CALLBACK(on_close_dlg), u_data); |