Fix bug where, after double-clicking to switch sheet view, a spurious release event...

[pspp] / src / ui / gui / pspp-sheet-view.c

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 51ceafcc6f4333c052e6c6ba14b25bef6c88ef03..32627beffdcf2bd8c2db1a8a30f80e148dc80bda 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -1266,7 +1266,6 @@ static void
 pspp_sheet_view_finalize (GObject *object)
 {
   PsppSheetView *tree_view = PSPP_SHEET_VIEW (object);
-  GList *list;
 
   pspp_sheet_view_stop_editing (tree_view, TRUE);
 
@@ -1519,6 +1518,8 @@ pspp_sheet_view_unrealize (GtkWidget *widget)
   PsppSheetViewPrivate *priv = tree_view->priv;
   GList *list;
 
+  GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
+
   if (priv->scroll_timeout != 0)
     {
       g_source_remove (priv->scroll_timeout);
@@ -1595,8 +1596,6 @@ pspp_sheet_view_unrealize (GtkWidget *widget)
        }
       tree_view->priv->columns = NULL;
     }
-
-  GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
 }
 
 /* GtkWidget::size_request helper */
@@ -2322,7 +2321,6 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
       PsppSheetViewColumn *column = NULL;
       GtkCellRenderer *focus_cell = NULL;
       gboolean row_double_click = FALSE;
-      gboolean node_selected;
 
       /* Empty tree? */
       if (tree_view->priv->row_count == 0)
@@ -2344,7 +2342,6 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
         return TRUE;
 
       /* select */
-      node_selected = pspp_sheet_view_node_is_selected (tree_view, node);
       pre_val = tree_view->priv->vadjustment->value;
 
       path = _pspp_sheet_view_find_path (tree_view, node);
@@ -2410,7 +2407,6 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
           tree_view->priv->press_start_node = node;
 
          if (tree_view->priv->rubber_banding_enable
-             //&& !node_selected
              && (tree_view->priv->selection->type == PSPP_SHEET_SELECTION_MULTIPLE ||
                   tree_view->priv->selection->type == PSPP_SHEET_SELECTION_RECTANGLE))
            {
@@ -2639,6 +2635,10 @@ pspp_sheet_view_button_release_edit (PsppSheetView *tree_view,
   if (event->window != tree_view->priv->bin_window)
     return FALSE;
 
+  /* Ignore a released button, if that button wasn't depressed */
+  if (tree_view->priv->pressed_button != event->button)
+    return FALSE;
+
   if (!find_click (tree_view, event->x, event->y, &node, &column, &background_area,
                    &cell_area))
     return FALSE;
@@ -3772,7 +3772,6 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   gint new_y;
   gint y_offset, cell_offset;
   gint max_height;
-  gint depth;
   GdkRectangle background_area;
   GdkRectangle cell_area;
   guint flags;
@@ -3845,7 +3844,6 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   gtk_tree_model_get_iter (tree_view->priv->model,
                           &iter,
                           path);
-  depth = gtk_tree_path_get_depth (path);
   gtk_tree_path_free (path);
   
   cursor_path = NULL;
@@ -5022,7 +5020,6 @@ validate_row (PsppSheetView *tree_view,
   gint horizontal_separator;
   gint vertical_separator;
   gint focus_line_width;
-  gboolean retval = FALSE;
   gboolean draw_vgrid_lines, draw_hgrid_lines;
   gint focus_pad;
   gint grid_line_width;
@@ -5085,10 +5082,7 @@ validate_row (PsppSheetView *tree_view,
        }
 
       if (tmp_width > column->requested_width)
-       {
-         retval = TRUE;
-         column->requested_width = tmp_width;
-       }
+        column->requested_width = tmp_width;
     }
 
   if (draw_hgrid_lines)
@@ -5361,6 +5355,9 @@ do_presize_handler (PsppSheetView *tree_view)
   validate_visible_area (tree_view);
   tree_view->priv->presize_handler_timer = 0;
 
+  if (! gtk_widget_get_realized (GTK_WIDGET (tree_view)))
+    return FALSE;
+
   gtk_widget_size_request (GTK_WIDGET (tree_view), &requisition);
 
   tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
@@ -8810,7 +8807,6 @@ pspp_sheet_view_set_model (PsppSheetView  *tree_view,
   if (tree_view->priv->model)
     {
       gint i;
-      GtkTreeModelFlags flags;
 
       if (tree_view->priv->search_column == -1)
        {
@@ -8844,8 +8840,6 @@ pspp_sheet_view_set_model (PsppSheetView  *tree_view,
                        G_CALLBACK (pspp_sheet_view_rows_reordered),
                        tree_view);
 
-      flags = gtk_tree_model_get_flags (tree_view->priv->model);
-
       tree_view->priv->row_count = gtk_tree_model_iter_n_children (tree_view->priv->model, NULL);
 
       /*  FIXME: do I need to do this? pspp_sheet_view_create_buttons (tree_view); */
@@ -11050,7 +11044,6 @@ pspp_sheet_view_create_row_drag_icon (PsppSheetView  *tree_view,
   GdkRectangle background_area;
   GdkRectangle expose_area;
   GtkWidget *widget;
-  gint depth;
   /* start drawing inside the black outline */
   gint x = 1, y = 1;
   GdkDrawable *drawable;
@@ -11065,8 +11058,6 @@ pspp_sheet_view_create_row_drag_icon (PsppSheetView  *tree_view,
   if (!gtk_widget_get_realized (widget))
     return NULL;
 
-  depth = gtk_tree_path_get_depth (path);
-
   _pspp_sheet_view_find_node (tree_view,
                             path,
                             &node);
@@ -12519,13 +12510,11 @@ pspp_sheet_view_set_grid_lines (PsppSheetView           *tree_view,
                              PsppSheetViewGridLines   grid_lines)
 {
   PsppSheetViewPrivate *priv;
-  GtkWidget *widget;
   PsppSheetViewGridLines old_grid_lines;
 
   g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
 
   priv = tree_view->priv;
-  widget = GTK_WIDGET (tree_view);
 
   old_grid_lines = priv->grid_lines;
   priv->grid_lines = grid_lines;
@@ -12569,12 +12558,10 @@ pspp_sheet_view_set_special_cells (PsppSheetView           *tree_view,
                              PsppSheetViewSpecialCells   special_cells)
 {
   PsppSheetViewPrivate *priv;
-  GtkWidget *widget;
 
   g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
 
   priv = tree_view->priv;
-  widget = GTK_WIDGET (tree_view);
 
   if (priv->special_cells != special_cells)
     {