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/uat_gui.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/uat_gui.c')
| -rw-r--r-- | ui/gtk/uat_gui.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index ce8c2c8f1a..db36a02e7f 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -1059,26 +1059,26 @@ static GtkWidget *uat_window(void *u) { gtk_box_pack_end(GTK_BOX(vbox), refresh_hbox, TRUE, FALSE, 0); - rep->bt_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP); + rep->bt_up = ws_gtk_button_new_from_stock(GTK_STOCK_GO_UP); gtk_widget_set_tooltip_text(rep->bt_up, "Move selected entry up"); - rep->bt_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); + rep->bt_down = ws_gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); gtk_widget_set_tooltip_text(rep->bt_down, "Move selected entry down"); gtk_box_pack_start(GTK_BOX(move_hbox), rep->bt_up, TRUE, FALSE, 5); gtk_box_pack_start(GTK_BOX(move_hbox), rep->bt_down, TRUE, FALSE, 5); - rep->bt_new = gtk_button_new_from_stock(GTK_STOCK_NEW); + rep->bt_new = ws_gtk_button_new_from_stock(GTK_STOCK_NEW); gtk_widget_set_tooltip_text(rep->bt_new, "Create a new entry"); - rep->bt_edit = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); + rep->bt_edit = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); gtk_widget_set_tooltip_text(rep->bt_edit, "Edit selected entry"); - rep->bt_copy = gtk_button_new_from_stock(GTK_STOCK_COPY); + rep->bt_copy = ws_gtk_button_new_from_stock(GTK_STOCK_COPY); gtk_widget_set_tooltip_text(rep->bt_copy, "Copy selected entry"); - rep->bt_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE); + rep->bt_delete = ws_gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_tooltip_text(rep->bt_delete, "Delete selected entry"); gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_new, TRUE, FALSE, 5); @@ -1086,10 +1086,10 @@ static GtkWidget *uat_window(void *u) { gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_copy, TRUE, FALSE, 5); gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_delete, TRUE, FALSE, 5); - rep->bt_refresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH); + rep->bt_refresh = ws_gtk_button_new_from_stock(GTK_STOCK_REFRESH); gtk_widget_set_tooltip_text(rep->bt_refresh, "Refresh from system defaults"); - rep->bt_clear = gtk_button_new_from_stock(GTK_STOCK_CLEAR); + rep->bt_clear = ws_gtk_button_new_from_stock(GTK_STOCK_CLEAR); gtk_widget_set_tooltip_text(rep->bt_clear, "Delete all entries"); gtk_box_pack_end(GTK_BOX(refresh_hbox), rep->bt_refresh, TRUE, FALSE, 5); |