X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-button-editable.c;h=05cc0057dd736459eb73d04c4e37b4d6be279237;hb=6b55442545f78ac54922e1a5b080b87b2b65f28c;hp=a3b910af22729fa10e73795184b76d92895150b7;hpb=ff02b7afa451420ecb0ffd3eae7a0d8b5614f1cb;p=pspp

diff --git a/src/ui/gui/psppire-button-editable.c b/src/ui/gui/psppire-button-editable.c
index a3b910af22..05cc0057dd 100644
--- a/src/ui/gui/psppire-button-editable.c
+++ b/src/ui/gui/psppire-button-editable.c
@@ -41,7 +41,6 @@ enum
   {
     PROP_0,
     PROP_PATH,
-    PROP_SLASH,
     PROP_EDITING_CANCELED
   };
 
@@ -60,10 +59,6 @@ psppire_button_editable_set_property (GObject      *object,
       obj->path = g_value_dup_string (value);
       break;
 
-    case PROP_SLASH:
-      psppire_button_editable_set_slash (obj, g_value_get_boolean (value));
-      break;
-
     case PROP_EDITING_CANCELED:
       break;
 
@@ -87,10 +82,6 @@ psppire_button_editable_get_property (GObject      *object,
       g_value_set_string (value, obj->path);
       break;
 
-    case PROP_SLASH:
-      g_value_set_boolean (value, psppire_button_editable_get_slash (obj));
-      break;
-
     case PROP_EDITING_CANCELED:
       g_value_set_boolean (value, FALSE);
       break;
@@ -115,39 +106,14 @@ static gboolean
 psppire_button_editable_button_release (GtkWidget      *widget,
                                         GdkEventButton *event)
 {
-  GtkButton *button;
-
   if (event->button == 1)
     {
-      button = GTK_BUTTON (widget);
-      gtk_button_released (button);
+      g_signal_emit_by_name (widget, "released", event, NULL);
     }
 
   return TRUE;
 }
 
-static gboolean
-psppire_button_editable_expose_event (GtkWidget      *widget,
-                                      GdkEventExpose *event)
-{
-  GtkWidgetClass *widget_class;
-  GtkStyle *style = gtk_widget_get_style (widget);
-  GtkAllocation allocation;
-  gboolean retval;
-
-  widget_class = GTK_WIDGET_CLASS (psppire_button_editable_parent_class);
-  retval = widget_class->expose_event (widget, event);
-
-  gtk_widget_get_allocation (widget, &allocation);
-  if (PSPPIRE_BUTTON_EDITABLE (widget)->slash)
-    gdk_draw_line (gtk_widget_get_window (widget), style->black_gc,
-                   allocation.x,
-                   allocation.y + allocation.height,
-                   allocation.x + allocation.width,
-                   allocation.y);
-  return retval;
-}
-
 static void
 psppire_button_editable_class_init (PsppireButtonEditableClass *class)
 {
@@ -162,7 +128,6 @@ psppire_button_editable_class_init (PsppireButtonEditableClass *class)
   gobject_class->finalize = psppire_button_editable_finalize;
 
   widget_class->button_release_event = psppire_button_editable_button_release;
-  widget_class->expose_event = psppire_button_editable_expose_event;
 
   g_object_class_install_property (gobject_class,
                                    PROP_PATH,
@@ -172,14 +137,6 @@ psppire_button_editable_class_init (PsppireButtonEditableClass *class)
 							"",
 							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."),
-                                                         FALSE,
-                                                         G_PARAM_READWRITE));
-
   g_object_class_override_property (gobject_class,
                                    PROP_EDITING_CANCELED,
                                     "editing-canceled");
@@ -189,7 +146,6 @@ static void
 psppire_button_editable_init (PsppireButtonEditable *obj)
 {
   obj->path = g_strdup ("");
-  obj->slash = FALSE;
 }
 
 PsppireButtonEditable *
@@ -198,24 +154,6 @@ psppire_button_editable_new (void)
   return PSPPIRE_BUTTON_EDITABLE (g_object_new (PSPPIRE_TYPE_BUTTON_EDITABLE, NULL));
 }
 
-void
-psppire_button_editable_set_slash (PsppireButtonEditable *button,
-                                   gboolean slash)
-{
-  g_return_if_fail (button != NULL);
-  if ((button->slash != 0) != (slash != 0))
-    {
-      button->slash = slash;
-      gtk_widget_queue_draw (GTK_WIDGET (button));
-    }
-}
-
-gboolean
-psppire_button_editable_get_slash (const PsppireButtonEditable *button)
-{
-  g_return_val_if_fail (button != NULL, FALSE);
-  return button->slash;
-}
 
 /* GtkCellEditable interface. */
 
@@ -232,15 +170,11 @@ gtk_cell_editable_interface_init (GtkCellEditableIface *iface)
 static void
 button_editable_editing_done (GtkCellEditable *cell_editable)
 {
-
-
 }
 
 static void
 button_editable_remove_widget (GtkCellEditable *cell_editable)
 {
-
-
 }
 
 static void