changeset 33583:c85b44e97e73

(w32_draw_bitmap): Use face to set colors.
author Jason Rumney <jasonr@gnu.org>
date Sat, 18 Nov 2000 01:57:57 +0000
parents 5ce190e20a23
children 1df24dca8931
files src/w32term.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);