X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-widget-facade.c;h=e5070bff3ec97f0b5446e6dd9c2bc3c96ae80807;hb=refs%2Fbuilds%2F20131209033050%2Fpspp;hp=ee065919cef67415d7f22fbeaf38e9b9fc888ce3;hpb=f9035ac5308961fa6957894b5660bdb3adad60d0;p=pspp diff --git a/src/ui/gui/pspp-widget-facade.c b/src/ui/gui/pspp-widget-facade.c index ee065919ce..e5070bff3e 100644 --- a/src/ui/gui/pspp-widget-facade.c +++ b/src/ui/gui/pspp-widget-facade.c @@ -313,10 +313,8 @@ get_layout_location (GtkWidget *base, void facade_button_render (GtkWidget *base, - GdkDrawable *window, - GdkRectangle *expose_area, - - GdkRectangle *button_area, + cairo_t *cr, + const GdkRectangle *button_area, gint border_width, GtkStyle *button_style, GtkStateType state_type, @@ -334,9 +332,9 @@ facade_button_render (GtkWidget *base, gint x, y; /* Paint the button. */ - gtk_paint_box (button_style, window, + gtk_paint_box (button_style, cr, state_type, - GTK_SHADOW_OUT, expose_area, base, "button", + GTK_SHADOW_OUT, base, "button", button_area->x + border_width, button_area->y + border_width, button_area->width - border_width * 2, @@ -350,8 +348,10 @@ facade_button_render (GtkWidget *base, layout = facade_label_get_layout (base, label); get_layout_location (base, &label_area, layout, xpad, ypad, xalign, yalign, &x, &y); - gtk_paint_layout (label_style, window, state_type, FALSE, expose_area, + + gtk_paint_layout (label_style, cr, state_type, FALSE, base, "label", x, y, layout); + g_object_unref (layout); }