diff options
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/macterm.c b/src/macterm.c index dacc63ffe96..41dfbc0c0ab 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -970,12 +970,16 @@ mac_scroll_area (display, w, gc, src_x, src_y, width, height, dest_x, dest_y) | |||
| 970 | SetRect (&dest_r, dest_x, dest_y, dest_x + width, dest_y + height); | 970 | SetRect (&dest_r, dest_x, dest_y, dest_x + width, dest_y + height); |
| 971 | 971 | ||
| 972 | SetPort (GetWindowPort (w)); | 972 | SetPort (GetWindowPort (w)); |
| 973 | mac_set_colors (gc); | 973 | |
| 974 | ForeColor (blackColor); | ||
| 975 | BackColor (whiteColor); | ||
| 974 | 976 | ||
| 975 | LockPortBits (GetWindowPort (w)); | 977 | LockPortBits (GetWindowPort (w)); |
| 976 | pmh = GetPortPixMap (GetWindowPort (w)); | 978 | pmh = GetPortPixMap (GetWindowPort (w)); |
| 977 | CopyBits ((BitMap *) *pmh, (BitMap *) *pmh, &src_r, &dest_r, srcCopy, 0); | 979 | CopyBits ((BitMap *) *pmh, (BitMap *) *pmh, &src_r, &dest_r, srcCopy, 0); |
| 978 | UnlockPortBits (GetWindowPort (w)); | 980 | UnlockPortBits (GetWindowPort (w)); |
| 981 | |||
| 982 | mac_set_colors (gc); | ||
| 979 | #else /* not TARGET_API_MAC_CARBON */ | 983 | #else /* not TARGET_API_MAC_CARBON */ |
| 980 | Rect src_r, dest_r; | 984 | Rect src_r, dest_r; |
| 981 | 985 | ||
| @@ -11649,6 +11653,8 @@ do_window_update (WindowPtr win) | |||
| 11649 | BeginUpdate (win); | 11653 | BeginUpdate (win); |
| 11650 | handling_window_update = 1; | 11654 | handling_window_update = 1; |
| 11651 | 11655 | ||
| 11656 | XClearWindow (FRAME_MAC_DISPLAY (f), FRAME_MAC_WINDOW (f)); | ||
| 11657 | |||
| 11652 | expose_frame (f, 0, 0, 0, 0); | 11658 | expose_frame (f, 0, 0, 0, 0); |
| 11653 | 11659 | ||
| 11654 | handling_window_update = 0; | 11660 | handling_window_update = 0; |
| @@ -12829,8 +12835,6 @@ void make_mac_frame (struct frame *f) | |||
| 12829 | FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right; | 12835 | FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_right; |
| 12830 | 12836 | ||
| 12831 | NewMacWindow(f); | 12837 | NewMacWindow(f); |
| 12832 | FRAME_BACKGROUND_PIXEL (f) = 0xffffff; | ||
| 12833 | FRAME_FOREGROUND_PIXEL (f) = 0; | ||
| 12834 | 12838 | ||
| 12835 | f->output_data.mac->cursor_pixel = 0; | 12839 | f->output_data.mac->cursor_pixel = 0; |
| 12836 | f->output_data.mac->border_pixel = 0x00ff00; | 12840 | f->output_data.mac->border_pixel = 0x00ff00; |