Mercurial > emacs

diff src/xterm.c @ 83505:57e924639750

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix previous commit. * src/frame.c (make_terminal_frame): Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL. * src/gtkutil.c (xg_create_frame_widgets): Ditto. * src/macfns.c (x_set_mouse_color): Ditto. * src/macfns.c (x_make_gc): Ditto. * src/msdos.c (ScreenVisualBell): Ditto. * src/msdos.c (internal_terminal_init): Ditto. * src/w32term.c (x_free_frame_resources): Ditto. * src/xfns.c (x_window): Ditto. * src/xterm.c (x_scroll_bar_create): Ditto. * src/xterm.c (x_scroll_bar_set_handle): Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-545
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 01 Apr 2006 16:37:26 +0000
parents 7aa43f830ce4
children b6689e223e2f
line wrap: on
line diff
--- a/src/xterm.c	Sat Apr 01 16:11:29 2006 +0000
+++ b/src/xterm.c	Sat Apr 01 16:37:26 2006 +0000
@@ -4732,7 +4732,7 @@
 
     a.background_pixel = f->output_data.x->scroll_bar_background_pixel;
     if (a.background_pixel == -1)
-      a.background_pixel = f->output_data.x->background_pixel;
+      a.background_pixel = FRAME_BACKGROUND_PIXEL (f);
 
     a.event_mask = (ButtonPressMask | ButtonReleaseMask
 		    | ButtonMotionMask | PointerMotionHintMask
@@ -4906,7 +4906,7 @@
     /* Restore the foreground color of the GC if we changed it above.  */
     if (f->output_data.x->scroll_bar_foreground_pixel != -1)
       XSetForeground (FRAME_X_DISPLAY (f), gc,
-		      f->output_data.x->foreground_pixel);
+		      FRAME_FOREGROUND_PIXEL (f));
 
     /* Draw the empty space below the handle.  Note that we can't
        clear zero-height areas; that means "clear to end of window." */