# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 974512677 0
# Node ID c85b44e97e73ffd33ede5c72a376b11d5a0fa9e1
# Parent  5ce190e20a23ccb676b342d1b9436f1ab40c00b7
(w32_draw_bitmap): Use face to set colors.

diff -r 5ce190e20a23 -r c85b44e97e73 src/w32term.c
--- a/src/w32term.c	Sat Nov 18 00:04:54 2000 +0000
+++ b/src/w32term.c	Sat Nov 18 01:57:57 2000 +0000
@@ -863,15 +863,17 @@
 
   compat_hdc = CreateCompatibleDC (hdc);
   SaveDC (hdc);
-  fg_brush = CreateSolidBrush (FRAME_FOREGROUND_PIXEL (f));
+  fg_brush = CreateSolidBrush (face->foreground);
   orig_brush = SelectObject (hdc, fg_brush);
   horig_obj = SelectObject (compat_hdc, pixmap);
-  SetTextColor (hdc, FRAME_BACKGROUND_PIXEL (f));
-  SetBkColor (hdc, FRAME_FOREGROUND_PIXEL (f));
+  SetTextColor (hdc, face->foreground);
+  SetBkColor (hdc, face->background);
 #if 0 /* From w32bdf.c (which is from Meadow).  */
+  /* Old versions - in case we find a reason to fall back on them.  */
   BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, SRCCOPY);
+  BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xB8074A);
 #else
-  BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xB8074A);
+  BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xE20746);
 #endif
   SelectObject (compat_hdc, horig_obj);
   SelectObject (hdc, orig_brush);