Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / pspp-widget-facade.c

diff --git a/src/ui/gui/pspp-widget-facade.c b/src/ui/gui/pspp-widget-facade.c
index 08f6572110d70972a53cbf7e94870cc3997b4aa3..e5070bff3ec97f0b5446e6dd9c2bc3c96ae80807 100644 (file)
--- a/src/ui/gui/pspp-widget-facade.c
+++ b/src/ui/gui/pspp-widget-facade.c
@@ -314,9 +314,7 @@ get_layout_location (GtkWidget *base,
 void
 facade_button_render (GtkWidget *base,
                       cairo_t *cr,
-                      GdkRectangle *expose_area,
-
-                      GdkRectangle *button_area,
+                      const GdkRectangle *button_area,
                       gint border_width,
                       GtkStyle *button_style,
                       GtkStateType state_type,