mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

(w32_draw_bitmap): Use face to set colors.

Browse Source
This commit is contained in:
Jason Rumney 2000-11-18 01:58:42 +00:00
parent 5f1e183edd
commit 92bb977fc2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2000-11-18 Jason Rumney <jasonr@gnu.org>
* w32term.c (w32_draw_bitmap): Use face to set colors.
2000-11-17 Dave Love <fx@gnu.org> 2000-11-17 Dave Love <fx@gnu.org>
* lread.c (Fload): Fix #ifdef for pcc. * lread.c (Fload): Fix #ifdef for pcc.

10
src/w32term.c
View File

@ -863,15 +863,17 @@ w32_draw_bitmap (w, hdc, row, which)
compat_hdc = CreateCompatibleDC (hdc); compat_hdc = CreateCompatibleDC (hdc);
SaveDC (hdc); SaveDC (hdc);
fg_brush = CreateSolidBrush (FRAME_FOREGROUND_PIXEL (f)); fg_brush = CreateSolidBrush (face->foreground);
orig_brush = SelectObject (hdc, fg_brush); orig_brush = SelectObject (hdc, fg_brush);
horig_obj = SelectObject (compat_hdc, pixmap); horig_obj = SelectObject (compat_hdc, pixmap);
SetTextColor (hdc, FRAME_BACKGROUND_PIXEL (f)); SetTextColor (hdc, face->foreground);
SetBkColor (hdc, FRAME_FOREGROUND_PIXEL (f)); SetBkColor (hdc, face->background);
#if 0 /* From w32bdf.c (which is from Meadow). */ #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, SRCCOPY);
#else
BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xB8074A); BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xB8074A);
#else
BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, 0, 0xE20746);
#endif #endif
SelectObject (compat_hdc, horig_obj); SelectObject (compat_hdc, horig_obj);
SelectObject (hdc, orig_brush); SelectObject (hdc, orig_brush);