diff options
| author | Jason Rumney <jasonr@gnu.org> | 2000-11-18 01:58:42 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2000-11-18 01:58:42 +0000 |
| commit | 92bb977fc2911b39a1ef9a2c6bba133415690789 (patch) | |
| tree | 30000aef2d895d2c1516d8f6c3f643793fc71dce | |
| parent | 5f1e183edd14b029ee81816884cac37e17d272af (diff) | |
| download | emacs-92bb977fc2911b39a1ef9a2c6bba133415690789.tar.gz | |
(w32_draw_bitmap): Use face to set colors.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32term.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 755f8755d28..254dc36c355 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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> * lread.c (Fload): Fix #ifdef for pcc. diff --git a/src/w32term.c b/src/w32term.c index c5161b489c7..8d125d7c690 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -863,15 +863,17 @@ w32_draw_bitmap (w, hdc, row, which) 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); -#else 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 SelectObject (compat_hdc, horig_obj); SelectObject (hdc, orig_brush); |