diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-05-23 12:27:56 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-05-23 12:27:56 +0200 |
| commit | ee14727ce033bae3bc11af35e7843604e5a5e635 (patch) | |
| tree | e343d880105ddefeb5c9db06dfc1072db7941708 | |
| parent | 6445ee0fb751ae2c1dfef900d44721b3d952812f (diff) | |
| download | emacs-cairo.tar.gz | |
Fixes to compile cairo branch without cairo.old-branches/cairocairo
* src/gtkutil.c (xg_update_scrollbar_pos): x_clear_area takes frame as
first argument.
* src/xterm.c (handle_one_xevent): Surround x_cr_destroy_surface with
USE_CAIRO.
| -rw-r--r-- | src/gtkutil.c | 3 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 5d28b0221af..a4b4331c039 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3824,8 +3824,7 @@ xg_update_scrollbar_pos (struct frame *f, above. */ oldw += (scale - 1) * oldw; oldx -= (scale - 1) * oldw; - x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - oldx, oldy, oldw, oldh); + x_clear_area (f, oldx, oldy, oldw, oldh); } /* GTK does not redraw until the main loop is entered again, but diff --git a/src/xterm.c b/src/xterm.c index 8f595c87214..4590e34fe8b 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8326,7 +8326,9 @@ handle_one_xevent (struct x_display_info *dpyinfo, { xg_frame_resized (f, event->xconfigure.width, event->xconfigure.height); +#ifdef USE_CAIRO x_cr_destroy_surface (f); +#endif f = 0; } #endif |