From e193566de41d65e055db306b9ca28b35daa8bc43 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 11 Apr 2015 00:28:32 +0100 Subject: Improve the stock icon/icon name compatability logic to be explicit --- gtk/compat.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gtk/compat.h') diff --git a/gtk/compat.h b/gtk/compat.h index 15c30ab05..52d10f35e 100644 --- a/gtk/compat.h +++ b/gtk/compat.h @@ -29,8 +29,15 @@ /* gtk 3.10 depricated the use of stock names */ #if GTK_CHECK_VERSION(3,10,0) +#define NSGTK_USE_ICON_NAME +#else +#undef NSGTK_USE_ICON_NAME +#endif + +/* icon names instead of stock */ +#ifdef NSGTK_USE_ICON_NAME #define NSGTK_STOCK_ADD "list-add" -#define NSGTK_STOCK_CANCEL "gtk-cancel" +#define NSGTK_STOCK_CANCEL "_Cancel" #define NSGTK_STOCK_CLEAR "edit-clear" #define NSGTK_STOCK_CLOSE "window-close" #define NSGTK_STOCK_FIND "edit-find" @@ -42,8 +49,8 @@ #define NSGTK_STOCK_SAVE "document-save" #define NSGTK_STOCK_SAVE_AS "document-save-as" #define NSGTK_STOCK_STOP "process-stop" -#define NSGTK_STOCK_OK "gtk-ok" -#define NSGTK_STOCK_OPEN "document-open" +#define NSGTK_STOCK_OK "_OK" +#define NSGTK_STOCK_OPEN "_Open" #else #define NSGTK_STOCK_ADD GTK_STOCK_ADD #define NSGTK_STOCK_CANCEL GTK_STOCK_CANCEL -- cgit v1.2.3