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

diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c
index 5a20ff5a8d..c31a73fce2 100644
--- 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 *);
@@ -204,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;
@@ -489,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));