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/graph_analysis.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/graph_analysis.c')
| -rw-r--r-- | ui/gtk/graph_analysis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 89f24ad055..7ea16fe076 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -62,6 +62,7 @@ #include "ui/gtk/graph_analysis.h" #include "ui/gtk/old-gtk-compat.h" +#include "ui/gtk/stock_icons.h" #include "../../image/voip_bg.xpm" @@ -1717,13 +1718,13 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data) gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30); gtk_widget_show(hbuttonbox); - bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); + bt_save = ws_gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_save, TRUE, TRUE, 0); gtk_widget_show(bt_save); g_signal_connect(bt_save, "clicked", G_CALLBACK(on_save_bt_clicked), user_data); gtk_widget_set_tooltip_text(bt_save, "Save an ASCII representation of the graph to a file"); - bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + bt_close = ws_gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_close, TRUE, TRUE, 0); gtk_widget_set_can_default(bt_close, TRUE); gtk_widget_show(bt_close); |