Merge master into gtk3.

[pspp] / src / output / cairo.h

diff --git a/src/output/cairo.h b/src/output/cairo.h
index 7ed828f515d61b24d7c5153cde9dc831dd7d44fe..3c137681773cbcade850405a85a2dc25509ffb44 100644 (file)
--- a/src/output/cairo.h
+++ b/src/output/cairo.h
@@ -41,8 +41,7 @@ struct xr_rendering *xr_rendering_create (struct xr_driver *,
 
 void xr_rendering_apply_options (struct xr_rendering *, struct string_map *o);
 void xr_rendering_measure (struct xr_rendering *, int *w, int *h);
-void xr_rendering_draw (struct xr_rendering *, cairo_t *,
-                        int x, int y, int w, int h);
+void xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr);
 
 /* Functions for rendering a series of output items to a series of Cairo
    contexts, with pagination, possibly including headers.