Remove call to deprecated gtk_style_context_get_font

[pspp] / src / ui / gui / psppire-cell-renderer-button.c

diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c
index c26849deae50b9dbbaa188e0d738d29e5e4e8ffd..c31a73fce23113fc0d0ef5c04fec45602cc4d4db 100644 (file)
--- a/src/ui/gui/psppire-cell-renderer-button.c
+++ b/src/ui/gui/psppire-cell-renderer-button.c
@@ -27,8 +27,7 @@
 #include "gl/configmake.h"
 #include "gl/relocatable.h"
 
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define P_(msgid) (msgid)
 
 static void psppire_cell_renderer_button_dispose (GObject *);
 static void psppire_cell_renderer_button_finalize (GObject *);
@@ -181,17 +180,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 +203,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 +214,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 +233,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 +403,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);
@@ -494,24 +488,24 @@ psppire_cell_renderer_button_class_init (PsppireCellRendererButtonClass *class)
   g_object_class_install_property (gobject_class,
                                    PROP_EDITABLE,
                                    g_param_spec_boolean ("editable",
-                                                         "Editable",
-                                                         "Whether the button may be clicked.",
+                                                         P_("Editable"),
+                                                         P_("Whether the button may be clicked."),
                                                          FALSE,
                                                          G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_LABEL,
                                    g_param_spec_string ("label",
-                                                        "Label",
-                                                        "Text to appear in button.",
+                                                        P_("Label"),
+                                                        P_("Text to appear in button."),
                                                         "",
                                                         G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SLASH,
                                    g_param_spec_boolean ("slash",
-                                                         _("Diagonal slash"),
-                                                         _("Whether to draw a diagonal slash across the button."),
+                                                         P_("Diagonal slash"),
+                                                         P_("Whether to draw a diagonal slash across the button."),
                                                          FALSE,
                                                          G_PARAM_READWRITE));