# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1179362362 0
# Node ID e224be42ac3024b6717117b5808be82a1563fad6
# Parent  a5651b79b31b51b02cb10e2a354f95a462e0dbdb
(x_output): Remove foreground_pixel and background_pixel.
(w32_clear_rect, w32_clear_area): Use background from frame.

diff -r a5651b79b31b -r e224be42ac30 src/w32term.h
--- a/src/w32term.h	Thu May 17 00:17:06 2007 +0000
+++ b/src/w32term.h	Thu May 17 00:39:22 2007 +0000
@@ -275,8 +275,10 @@
    diffs between X and w32 code.  */
 struct x_output
 {
+#if 0 /* These are also defined in struct frame.  Use that instead.  */
   PIX_TYPE background_pixel;
   PIX_TYPE foreground_pixel;
+#endif
 
   /* Keep track of focus.  May be EXPLICIT if we received a FocusIn for this
      frame, or IMPLICIT if we received an EnterNotify.
@@ -587,10 +589,10 @@
 }
 
 #define w32_clear_rect(f,hdc,lprect) \
-w32_fill_rect (f,hdc,f->output_data.x->background_pixel,lprect)
+  w32_fill_rect (f, hdc, FRAME_BACKGROUND_PIXEL (f), lprect)
 
 #define w32_clear_area(f,hdc,px,py,nx,ny) \
-w32_fill_area (f,hdc,f->output_data.x->background_pixel,px,py,nx,ny)
+  w32_fill_area (f, hdc, FRAME_BACKGROUND_PIXEL (f), px, py, nx, ny)
 
 extern struct font_info *w32_load_font ();
 extern void w32_unload_font ();