Avoid deprecation warnings by use of gtk2 -> gtk3 wrapper macros.

[pspp] / src / output / cairo.h

diff --git a/src/output/cairo.h b/src/output/cairo.h
index 77889d11aa9158b055d79db98bf285f8e847b91f..9a0e17a1d52bf03461d5095f1c6fe66d54db86ff 100644 (file)
--- a/src/output/cairo.h
+++ b/src/output/cairo.h
@@ -31,14 +31,17 @@ struct string_map;
 struct xr_driver *xr_driver_create (cairo_t *, struct string_map *options);
 void xr_driver_destroy (struct xr_driver *);
 
+
 /* Functions for rendering a single output item to a Cairo context.
    Output items are never broken across multiple pages.
    Used by PSPPIRE to render in the GUI. */
 struct xr_rendering *xr_rendering_create (struct xr_driver *,
                                           const struct output_item *,
                                           cairo_t *);
+
+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 *);
+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.
@@ -79,8 +82,6 @@ bool xr_driver_need_new_page (const struct xr_driver *);
 bool xr_driver_is_page_blank (const struct xr_driver *);
 
 /* Render charts with Cairo. */
-void xr_draw_chart (const struct chart_item *, cairo_t *,
-                    double x, double y, double width, double height);
 char *xr_draw_png_chart (const struct chart_item *,
                          const char *file_name_template, int number);