From 5406be4db6528095b5e5b8bf94b06b2c06610340 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Fri, 29 Sep 2017 22:43:19 +0200 Subject: [PATCH] Revert "GTK+: Stop querying for background colors." This reverts commit f6818e761eaafe095e07249180dc8f9a329f1473. --- src/gtkutil.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/gtkutil.c b/src/gtkutil.c index b98b0d08e7a..f3e89c82c66 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -566,14 +566,6 @@ xg_check_special_colors (struct frame *f, if (! FRAME_GTK_WIDGET (f) || ! (get_bg || get_fg)) return success_p; -#if GTK_CHECK_VERSION (3, 16, 0) - if (get_bg) - /* gtk_style_context_get_background_color is deprecated in - GTK+ 3.16. New versions of GTK+ don't use the concept of a - single background color any more, so we can't query for it. */ - return false; -#endif - block_input (); { #ifdef HAVE_GTK3 @@ -585,12 +577,7 @@ xg_check_special_colors (struct frame *f, if (get_fg) gtk_style_context_get_color (gsty, state, &col); else -#if GTK_CHECK_VERSION (3, 16, 0) - /* We can't get here. */ - emacs_abort (); -#else gtk_style_context_get_background_color (gsty, state, &col); -#endif unsigned short r = col.red * 65535, -- 2.11.4.GIT