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/mcast_stream_dlg.c | |
| parent | 234ab5b7632f03e8cdc3ad28f8bc22a00c2978d6 (diff) | |
| download | wireshark-00be1d31ce580a6ad7ac37cb04d2dea9f20fa130.tar.gz | |
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/mcast_stream_dlg.c')
| -rw-r--r-- | ui/gtk/mcast_stream_dlg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index 47461590b0..3802ad5d17 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -51,6 +51,7 @@ #include "ui/gtk/gui_utils.h" #include "ui/gtk/gtkglobals.h" #include "ui/gtk/old-gtk-compat.h" +#include "ui/gtk/stock_icons.h" void register_tap_listener_mcast_stream_dlg(void); @@ -332,9 +333,9 @@ mcast_on_params(GtkButton *button _U_, gpointer data _U_) /* button row */ hbuttonbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); ws_gtk_grid_attach_defaults(GTK_GRID(grid), hbuttonbox, 0, 5, 2, 1); - ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK); + ok_bt = ws_gtk_button_new_from_stock(GTK_STOCK_OK); gtk_container_add (GTK_CONTAINER(hbuttonbox), ok_bt); - cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL); + cancel_bt = ws_gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_container_add (GTK_CONTAINER(hbuttonbox), cancel_bt); gtk_widget_set_can_default(cancel_bt, TRUE); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END); @@ -694,7 +695,7 @@ mcaststream_dlg_create(void) gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter); gtk_widget_set_tooltip_text (bt_filter, "Prepare a display filter of the selected stream"); - 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 (hbuttonbox), bt_close); gtk_widget_set_tooltip_text (bt_close, "Close this dialog"); gtk_widget_set_can_default(bt_close, TRUE); |