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

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 4af75caae455f3a5f03f1c687bcfba7efc45c324..a3070dddef3e2e69dc65ff58a3c4c8f1b82d7739 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -1371,11 +1371,9 @@ xr_rendering_measure (struct xr_rendering *r, int *w, int *h)
 static void xr_draw_chart (const struct chart_item *, cairo_t *,
                     double x, double y, double width, double height);
 
-/* Draws onto CR at least the region of R that is enclosed in (X,Y)-(X+W,Y+H),
-   and possibly some additional parts. */
+/* Draws onto CR */
 void
-xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
-                   int x, int y, int w, int h)
+xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr)
 {
   if (is_table_item (r->item))
     {
@@ -1383,10 +1381,8 @@ xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
 
       xr_set_cairo (xr, cr);
 
-      xr->y = 0;
-      render_pager_draw_region (r->p,
-                                x * XR_POINT, y * XR_POINT,
-                                w * XR_POINT, h * XR_POINT);
+      render_pager_draw (r->p);
+
     }
   else
     xr_draw_chart (to_chart_item (r->item), cr,