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/follow_stream.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/follow_stream.c')
| -rw-r--r-- | ui/gtk/follow_stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index d9c62f5262..4d5170c32a 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -737,19 +737,19 @@ follow_stream(const gchar *title, follow_info_t *follow_info, gtk_box_pack_start(GTK_BOX(stream_vb), hbox, FALSE, FALSE, 0); /* Create Find Button */ - button = gtk_button_new_from_stock(GTK_STOCK_FIND); + button = ws_gtk_button_new_from_stock(GTK_STOCK_FIND); g_signal_connect(button, "clicked", G_CALLBACK(follow_find_cb), follow_info); gtk_widget_set_tooltip_text(button, "Find text in the displayed content"); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); /* Create Save As Button */ - button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); + button = ws_gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); g_signal_connect(button, "clicked", G_CALLBACK(follow_save_as_cmd_cb), follow_info); gtk_widget_set_tooltip_text(button, "Save the content as currently displayed"); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); /* Create Print Button */ - button = gtk_button_new_from_stock(GTK_STOCK_PRINT); + button = ws_gtk_button_new_from_stock(GTK_STOCK_PRINT); g_signal_connect(button, "clicked", G_CALLBACK(follow_print_stream), follow_info); gtk_widget_set_tooltip_text(button, "Print the content as currently displayed"); gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0); |