From 42971dc42ac95ec38b3ddd33142ff921e3b39512 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Tue, 11 Mar 2014 09:52:11 +0100 Subject: [PATCH] Don't use some stock icons missing in old (< 2.16) versions in GTK+ Change-Id: I2716a8a25627de9c3945fbf5117edcb4859aa95f Reviewed-on: https://code.wireshark.org/review/605 Reviewed-by: Anders Broman --- ui/gtk/stock_icons.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index c174b0a67d..73da93e0a1 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -173,7 +173,9 @@ static stock_item_t gtk_stock_items[] = { {(char *)GTK_STOCK_APPLY, NULL, (char *)"_Apply"}, {(char *)GTK_STOCK_BOLD, (char *)"format-text-bold", (char *)"_Bold"}, {(char *)GTK_STOCK_CANCEL, NULL, (char *)"_Cancel"}, +#ifdef GTK_STOCK_CAPS_LOCK_WARNING {(char *)GTK_STOCK_CAPS_LOCK_WARNING, NULL, NULL}, +#endif {(char *)GTK_STOCK_CDROM, (char *)"media-optical", (char *)"_CD-ROM"}, {(char *)GTK_STOCK_CLEAR, (char *)"edit-clear", (char *)"_Clear"}, {(char *)GTK_STOCK_CLOSE, (char *)"window-close", (char *)"_Close"}, @@ -239,15 +241,23 @@ static stock_item_t gtk_stock_items[] = { {(char *)GTK_STOCK_ORIENTATION_LANDSCAPE, (char *)"?", (char *)"Landscape"}, {(char *)GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, (char *)"?", (char *)"Reverse landscape"}, {(char *)GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, (char *)"?", (char *)"Reverse portrait"}, +#ifdef GTK_STOCK_PAGE_SETUP {(char *)GTK_STOCK_PAGE_SETUP, (char *)"document-page-setup", (char *)"Page Set_up"}, +#endif {(char *)GTK_STOCK_PASTE, (char *)"edit-paste", (char *)"_Paste"}, {(char *)GTK_STOCK_PREFERENCES, (char *)"preferences-system", (char *)"_Preferences"}, {(char *)GTK_STOCK_PRINT, (char *)"document-print", (char *)"_Print"}, {(char *)GTK_STOCK_PRINT_ERROR, (char *)"printer-error", NULL}, +#ifdef GTK_STOCK_PRINT_PAUSED {(char *)GTK_STOCK_PRINT_PAUSED, NULL, NULL}, +#endif {(char *)GTK_STOCK_PRINT_PREVIEW, NULL, (char *)"Print Pre_view"}, +#ifdef GTK_STOCK_PRINT_REPORT {(char *)GTK_STOCK_PRINT_REPORT, NULL, NULL}, +#endif +#ifdef GTK_STOCK_PRINT_WARNING {(char *)GTK_STOCK_PRINT_WARNING, NULL, NULL}, +#endif {(char *)GTK_STOCK_PROPERTIES, (char *)"document-properties", (char *)"_Properties"}, {(char *)GTK_STOCK_QUIT, (char *)"application-exit", (char *)"_Quit"}, {(char *)GTK_STOCK_REDO, (char *)"edit-redo", (char *)"_Redo"},