changeset 39159:2c7a6a1b047e

(x_set_background_color): Don't change the colors of the X window of scroll bar widgets.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 06 Sep 2001 12:48:06 +0000
parents b4ea3ae25b50
children 851d0426c8a4
files src/xfns.c
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfns.c	Thu Sep 06 08:49:34 2001 +0000
+++ b/src/xfns.c	Thu Sep 06 12:48:06 2001 +0000
@@ -1410,7 +1410,6 @@
   if (FRAME_X_WINDOW (f) != 0)
     {
       Display *dpy = FRAME_X_DISPLAY (f);
-      Lisp_Object bar;
       
       BLOCK_INPUT;
       XSetBackground (dpy, x->normal_gc, bg);
@@ -1418,13 +1417,19 @@
       XSetWindowBackground (dpy, FRAME_X_WINDOW (f), bg);
       XSetForeground (dpy, x->cursor_gc, bg);
 
-      for (bar = FRAME_SCROLL_BARS (f);
-	   !NILP (bar);
-	   bar = XSCROLL_BAR (bar)->next)
-	{
-	  Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar));
-	  XSetWindowBackground (dpy, window, bg);
-	}
+#ifndef USE_TOOLKIT_SCROLL_BARS /* Turns out to be annoying with
+				   toolkit scroll bars.  */
+      {
+	Lisp_Object bar;
+	for (bar = FRAME_SCROLL_BARS (f);
+	     !NILP (bar);
+	     bar = XSCROLL_BAR (bar)->next)
+	  {
+	    Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar));
+	    XSetWindowBackground (dpy, window, bg);
+	  }
+      }
+#endif /* USE_TOOLKIT_SCROLL_BARS */
 
       UNBLOCK_INPUT;
       update_face_from_frame_parameter (f, Qbackground_color, arg);