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/main_statusbar.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/main_statusbar.c')
| -rw-r--r-- | ui/gtk/main_statusbar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index 5b4c164120..a76d03470c 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -54,6 +54,7 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/expert_comp_dlg.h" +#include "ui/gtk/stock_icons.h" #include "ui/gtk/profile_dlg.h" #include "ui/gtk/main_welcome.h" #include "ui/gtk/expert_indicators.h" @@ -594,7 +595,7 @@ status_expert_new(void) gtk_container_add(GTK_CONTAINER(expert_info_chat), expert_image); g_signal_connect(expert_info_chat, "button_press_event", G_CALLBACK(expert_comp_dlg_event_cb), NULL); - expert_image = gtk_image_new_from_stock(GTK_STOCK_YES, GTK_ICON_SIZE_MENU); + expert_image = ws_gtk_image_new_from_stock(GTK_STOCK_YES, GTK_ICON_SIZE_MENU); gtk_widget_set_tooltip_text(expert_image, "COMMENT is the highest expert info level"); gtk_widget_show(expert_image); expert_info_comment = gtk_event_box_new(); |