merge master->gtk3, fixed psppire-output-view.c refactoring; this compiles and runs...

[pspp] / src / output / cairo.h

diff --git a/src/output/cairo.h b/src/output/cairo.h
index cdd55369005364f1a69b303617b38727b713147f..425811b450ff89e37260e52342040609389c1d7a 100644 (file)
--- a/src/output/cairo.h
+++ b/src/output/cairo.h
@@ -42,8 +42,7 @@ void xr_rendering_destroy (struct xr_rendering *);
 
 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.