X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-cell-renderer-button.c;h=6b25b3fa3b649827873ff4c50ba7f0f4d9ec7688;hb=6b55442545f78ac54922e1a5b080b87b2b65f28c;hp=c26849deae50b9dbbaa188e0d738d29e5e4e8ffd;hpb=34e954c88e221ee1f38ea1ac8af1d1933b536097;p=pspp

diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c
index c26849deae..6b25b3fa3b 100644
--- a/src/ui/gui/psppire-cell-renderer-button.c
+++ b/src/ui/gui/psppire-cell-renderer-button.c
@@ -181,17 +181,15 @@ update_style_cache (PsppireCellRendererButton *button,
 
 static void
 psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
-                                     GdkWindow            *window,
+                                     cairo_t              *cr,
                                      GtkWidget            *widget,
-                                     GdkRectangle         *background_area,
-                                     GdkRectangle         *cell_area,
-                                     GdkRectangle         *expose_area,
+                                     const GdkRectangle         *background_area,
+                                     const GdkRectangle         *cell_area,
                                      GtkCellRendererState  flags)
 {
   GtkStateType state_type;
   PsppireCellRendererButton *button = PSPPIRE_CELL_RENDERER_BUTTON (cell);
   gfloat xalign, yalign;
-  cairo_t *cr ;
   
   if (!button->editable || ! gtk_cell_renderer_get_sensitive (cell))
     state_type = GTK_STATE_INSENSITIVE;
@@ -206,7 +204,7 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
     state_type = GTK_STATE_PRELIGHT;
   else
     {
-      if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+      if (gtk_widget_get_state_flags (widget) == GTK_STATE_FLAG_INSENSITIVE)
         state_type = GTK_STATE_INSENSITIVE;
       else
         state_type = GTK_STATE_NORMAL;
@@ -217,8 +215,7 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
 
   update_style_cache (button, widget);
 
-  cr = gdk_cairo_create (window);
-  facade_button_render (widget, cr, expose_area,
+  facade_button_render (widget, cr,
                         cell_area, button->border_width, button->button_style,
                         state_type,
                         button->label_style, button->label, button->xpad,
@@ -237,14 +234,12 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
 		     cell_area->y);
       cairo_stroke (cr);
     }
-
-  cairo_destroy (cr);
 }
 
 static void
 psppire_cell_renderer_button_get_size (GtkCellRenderer      *cell,
                                        GtkWidget            *widget,
-                                       GdkRectangle         *cell_area,
+                                       const GdkRectangle   *cell_area,
                                        gint                 *x_offset,
                                        gint                 *y_offset,
                                        gint                 *width,
@@ -409,8 +404,8 @@ psppire_cell_renderer_button_start_editing (GtkCellRenderer      *cell,
                                             GdkEvent             *event,
                                             GtkWidget            *widget,
                                             const gchar          *path,
-                                            GdkRectangle         *background_area,
-                                            GdkRectangle         *cell_area,
+                                            const GdkRectangle   *background_area,
+                                            const GdkRectangle   *cell_area,
                                             GtkCellRendererState  flags)
 {
   PsppireCellRendererButton *cell_button = PSPPIRE_CELL_RENDERER_BUTTON (cell);