psppire-dictview: Generalize psppire_dict_view_get_var_measurement_stock_id().

[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 f312a01900e06bf46dd3b626c59269f91527b550..703ff3ddfd3056572b168dbc095cc58199bb2cd4 100644 (file)
--- a/src/ui/gui/psppire-cell-renderer-button.c
+++ b/src/ui/gui/psppire-cell-renderer-button.c
@@ -346,10 +346,11 @@ psppire_cell_renderer_button_press_event (GtkButton      *button,
          parent window, because the normal GObject signal propagation mechanism
          won't do it for us.  (This might be a hint that we're doing this
          wrong.) */
-      gdk_window_coords_to_parent (event->window,
-                                   event->x, event->y,
-                                   &event->x, &event->y);
-      event->window = gdk_window_get_parent (event->window);
+      gint x, y;
+
+      gdk_window_get_position (event->window, &x, &y);
+      event->x += x;
+      event->y += y;
       g_signal_stop_emission_by_name (button, "button-press-event");
       return FALSE;
     }
@@ -406,7 +407,6 @@ psppire_cell_renderer_button_start_editing (GtkCellRenderer      *cell,
                                       "xalign", xalign,
                                       "yalign", yalign,
                                       "path", path,
-                                      "slash", cell_button->slash,
                                       NULL);
 
   g_signal_connect (G_OBJECT (cell_button->button), "clicked",