X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-cell-renderer-button.c;h=e801cc6bf30ba6c1e8e42b7e1d40ee45e6bf8f70;hb=ecad37996f533d5cd8348ad68659470e821f5ebd;hp=5a20ff5a8df8d039acaf3050cad37ac09c5fde93;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp

diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c
index 5a20ff5a8d..e801cc6bf3 100644
--- a/src/ui/gui/psppire-cell-renderer-button.c
+++ b/src/ui/gui/psppire-cell-renderer-button.c
@@ -27,8 +27,9 @@
 #include "gl/configmake.h"
 #include "gl/relocatable.h"
 
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+#define P_(msgid) (msgid)
 
 static void psppire_cell_renderer_button_dispose (GObject *);
 static void psppire_cell_renderer_button_finalize (GObject *);
@@ -190,7 +191,7 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
   GtkStateType state_type;
   PsppireCellRendererButton *button = PSPPIRE_CELL_RENDERER_BUTTON (cell);
   gfloat xalign, yalign;
-  
+
   if (!button->editable || ! gtk_cell_renderer_get_sensitive (cell))
     state_type = GTK_STATE_INSENSITIVE;
   else if (flags & GTK_CELL_RENDERER_SELECTED)
@@ -204,7 +205,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;
@@ -225,7 +226,7 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
     {
       cairo_set_line_width (cr, 1.0);
       cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
-      cairo_move_to (cr, 
+      cairo_move_to (cr,
 		     cell_area->x,
 		     cell_area->y + cell_area->height);
 
@@ -489,24 +490,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));
 
@@ -547,7 +548,7 @@ psppire_cell_renderer_button_dispose (GObject *obj)
 
   if (button->dispose_has_run)
     return;
-  
+
   button->dispose_has_run = TRUE;
 
   /* When called with NULL, as we are doing here, update_style_cache