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/file_import_dlg.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/file_import_dlg.c')
-rw-r--r-- | ui/gtk/file_import_dlg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index 73f7e71db6..7db9cacbe4 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -887,7 +887,7 @@ file_import_dlg_new(void) g_object_set_data(G_OBJECT(input_frm), INPUT_FILENAME_TE_KEY, filename_te); - browse_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE); + browse_bt = ws_gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE); gtk_widget_set_tooltip_text(browse_bt, "Browse for text file to import"); ws_gtk_grid_attach(GTK_GRID(input_grid), browse_bt, 2, 0, 1, 1); |