aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPhilipp Stephani2017-09-29 22:43:19 +0200
committerPhilipp Stephani2017-09-29 22:43:19 +0200
commit5406be4db6528095b5e5b8bf94b06b2c06610340 (patch)
treef6b0a7c90afdb2173ae1f370607a4f707c1f20a8 /src
parent122ffe521b2b34caa6a1f2583878c569ea395cb3 (diff)
downloademacs-5406be4db6528095b5e5b8bf94b06b2c06610340.tar.gz
emacs-5406be4db6528095b5e5b8bf94b06b2c06610340.zip
Revert "GTK+: Stop querying for background colors."
This reverts commit f6818e761eaafe095e07249180dc8f9a329f1473.
Diffstat (limited to 'src')
-rw-r--r--src/gtkutil.c13
1 files changed, 0 insertions, 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,
566 if (! FRAME_GTK_WIDGET (f) || ! (get_bg || get_fg)) 566 if (! FRAME_GTK_WIDGET (f) || ! (get_bg || get_fg))
567 return success_p; 567 return success_p;
568 568
569#if GTK_CHECK_VERSION (3, 16, 0)
570 if (get_bg)
571 /* gtk_style_context_get_background_color is deprecated in
572 GTK+ 3.16. New versions of GTK+ don't use the concept of a
573 single background color any more, so we can't query for it. */
574 return false;
575#endif
576
577 block_input (); 569 block_input ();
578 { 570 {
579#ifdef HAVE_GTK3 571#ifdef HAVE_GTK3
@@ -585,12 +577,7 @@ xg_check_special_colors (struct frame *f,
585 if (get_fg) 577 if (get_fg)
586 gtk_style_context_get_color (gsty, state, &col); 578 gtk_style_context_get_color (gsty, state, &col);
587 else 579 else
588#if GTK_CHECK_VERSION (3, 16, 0)
589 /* We can't get here. */
590 emacs_abort ();
591#else
592 gtk_style_context_get_background_color (gsty, state, &col); 580 gtk_style_context_get_background_color (gsty, state, &col);
593#endif
594 581
595 unsigned short 582 unsigned short
596 r = col.red * 65535, 583 r = col.red * 65535,