pspp-sheet-view: Improve look of sheet when there are few columns.
[pspp] / src / ui / gui / pspp-sheet-view.c
index a867d425dc118c8ebf1b4a7e440a87f35c04472b..0cf10f175c364590b5732a61aa6ac72d1eed2a30 100644 (file)
@@ -143,7 +143,8 @@ enum {
   PROP_HOVER_SELECTION,
   PROP_RUBBER_BANDING,
   PROP_ENABLE_GRID_LINES,
-  PROP_TOOLTIP_COLUMN
+  PROP_TOOLTIP_COLUMN,
+  PROP_SPECIAL_CELLS
 };
 
 /* object signals */
@@ -404,6 +405,12 @@ static gboolean pspp_sheet_view_start_interactive_search      (PsppSheetView *tr
 static PsppSheetViewColumn *pspp_sheet_view_get_drop_column (PsppSheetView       *tree_view,
                                                         PsppSheetViewColumn *column,
                                                         gint               drop_position);
+static void
+pspp_sheet_view_adjust_cell_area (PsppSheetView        *tree_view,
+                                  PsppSheetViewColumn  *column,
+                                  const GdkRectangle   *background_area,
+                                  gboolean              subtract_focus_rect,
+                                  GdkRectangle         *cell_area);
 static gint pspp_sheet_view_find_offset (PsppSheetView *tree_view,
                                          gint height,
                                          int *new_node);
@@ -623,6 +630,15 @@ pspp_sheet_view_class_init (PsppSheetViewClass *class)
                                                       -1,
                                                       GTK_PARAM_READWRITE));
 
+    g_object_class_install_property (o_class,
+                                     PROP_SPECIAL_CELLS,
+                                     g_param_spec_enum ("special-cells",
+                                                       P_("Special Cells"),
+                                                       P_("Whether rows have special cells."),
+                                                       PSPP_TYPE_SHEET_VIEW_SPECIAL_CELLS,
+                                                       PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT,
+                                                       GTK_PARAM_READWRITE));
+
   /* Style properties */
 #define _TREE_VIEW_EXPANDER_SIZE 12
 #define _TREE_VIEW_VERTICAL_SEPARATOR 2
@@ -999,6 +1015,8 @@ pspp_sheet_view_init (PsppSheetView *tree_view)
 
   tree_view->priv->tooltip_column = -1;
 
+  tree_view->priv->special_cells = PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT;
+
   tree_view->priv->post_validation_flag = FALSE;
 
   tree_view->priv->last_button_x = -1;
@@ -1012,6 +1030,8 @@ pspp_sheet_view_init (PsppSheetView *tree_view)
   tree_view->priv->rubber_band_end_node = -1;
 
   tree_view->priv->anchor_column = NULL;
+
+  tree_view->priv->button_style = NULL;
 }
 
 \f
@@ -1070,6 +1090,9 @@ pspp_sheet_view_set_property (GObject         *object,
     case PROP_TOOLTIP_COLUMN:
       pspp_sheet_view_set_tooltip_column (tree_view, g_value_get_int (value));
       break;
+    case PROP_SPECIAL_CELLS:
+      pspp_sheet_view_set_special_cells (tree_view, g_value_get_enum (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1127,6 +1150,9 @@ pspp_sheet_view_get_property (GObject    *object,
     case PROP_TOOLTIP_COLUMN:
       g_value_set_int (value, tree_view->priv->tooltip_column);
       break;
+    case PROP_SPECIAL_CELLS:
+      g_value_set_enum (value, tree_view->priv->special_cells);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1265,6 +1291,12 @@ pspp_sheet_view_destroy (GtkObject *object)
       tree_view->priv->vadjustment = NULL;
     }
 
+  if (tree_view->priv->button_style)
+    {
+      g_object_unref (tree_view->priv->button_style);
+      tree_view->priv->button_style = NULL;
+    }
+
   GTK_OBJECT_CLASS (pspp_sheet_view_parent_class)->destroy (object);
 }
 
@@ -1288,14 +1320,15 @@ pspp_sheet_view_map_buttons (PsppSheetView *tree_view)
       for (list = tree_view->priv->columns; list; list = list->next)
        {
          column = list->data;
-          if (gtk_widget_get_visible (column->button) &&
+          if (column->button != NULL &&
+              gtk_widget_get_visible (column->button) &&
               !gtk_widget_get_mapped (column->button))
             gtk_widget_map (column->button);
        }
       for (list = tree_view->priv->columns; list; list = list->next)
        {
          column = list->data;
-         if (column->visible == FALSE)
+         if (column->visible == FALSE || column->window == NULL)
            continue;
          if (column->resizable)
            {
@@ -1514,12 +1547,7 @@ pspp_sheet_view_size_request_columns (PsppSheetView *tree_view)
           GtkRequisition requisition;
           PsppSheetViewColumn *column = list->data;
 
-         if (column->button == NULL)
-           continue;
-
-          column = list->data;
-         
-          gtk_widget_size_request (column->button, &requisition);
+          pspp_sheet_view_column_size_request (column, &requisition);
          column->button_request = requisition.width;
           tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
         }
@@ -1683,6 +1711,15 @@ pspp_sheet_view_get_real_requested_width_from_column (PsppSheetView       *tree_
   return real_requested_width;
 }
 
+static gboolean
+span_intersects (int a0, int a_width,
+                 int b0, int b_width)
+{
+  int a1 = a0 + a_width;
+  int b1 = b0 + b_width;
+  return (a0 >= b0 && a0 < b1) || (b0 >= a0 && b0 < a1);
+}
+
 /* GtkWidget::size_allocate helper */
 static void
 pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
@@ -1693,13 +1730,12 @@ pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
   PsppSheetViewColumn *column;
   GtkAllocation allocation;
   gint width = 0;
-  gint extra, extra_per_column, extra_for_last;
+  gint extra, extra_per_column;
   gint full_requested_width = 0;
   gint number_of_expand_columns = 0;
   gboolean column_changed = FALSE;
   gboolean rtl;
-  gboolean update_expand;
-  
+
   tree_view = PSPP_SHEET_VIEW (widget);
 
   for (last_column = g_list_last (tree_view->priv->columns);
@@ -1733,42 +1769,12 @@ pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
        number_of_expand_columns++;
     }
 
-  /* Only update the expand value if the width of the widget has changed,
-   * or the number of expand columns has changed, or if there are no expand
-   * columns, or if we didn't have an size-allocation yet after the
-   * last validated node.
-   */
-  update_expand = (width_changed && *width_changed == TRUE)
-      || number_of_expand_columns != tree_view->priv->last_number_of_expand_columns
-      || number_of_expand_columns == 0
-      || tree_view->priv->post_validation_flag == TRUE;
-
-  tree_view->priv->post_validation_flag = FALSE;
-
-  if (!update_expand)
-    {
-      extra = tree_view->priv->last_extra_space;
-      extra_for_last = MAX (widget->allocation.width - full_requested_width - extra, 0);
-    }
-  else
-    {
-      extra = MAX (widget->allocation.width - full_requested_width, 0);
-      extra_for_last = 0;
-
-      tree_view->priv->last_extra_space = extra;
-    }
-
+  extra = MAX (widget->allocation.width - full_requested_width, 0);
   if (number_of_expand_columns > 0)
     extra_per_column = extra/number_of_expand_columns;
   else
     extra_per_column = 0;
 
-  if (update_expand)
-    {
-      tree_view->priv->last_extra_space_per_column = extra_per_column;
-      tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
-    }
-
   for (list = (rtl ? last_column : first_column); 
        list != (rtl ? first_column->prev : last_column->next);
        list = (rtl ? list->prev : list->next)) 
@@ -1792,8 +1798,8 @@ pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
                                 &(drag_allocation.height));
          drag_allocation.x = 0;
          drag_allocation.y = 0;
-         gtk_widget_size_allocate (tree_view->priv->drag_column->button,
-                                   &drag_allocation);
+          pspp_sheet_view_column_size_allocate (tree_view->priv->drag_column,
+                                                &drag_allocation);
          width += drag_allocation.width;
          continue;
        }
@@ -1818,19 +1824,9 @@ pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
              number_of_expand_columns --;
            }
        }
-      else if (number_of_expand_columns == 0 &&
-              list == last_column)
-       {
-         column->width += extra;
-       }
 
-      /* In addition to expand, the last column can get even more
-       * extra space so all available space is filled up.
-       */
-      if (extra_for_last > 0 && list == last_column)
-       column->width += extra_for_last;
-
-      g_object_notify (G_OBJECT (column), "width");
+      if (column->width != old_width)
+        g_object_notify (G_OBJECT (column), "width");
 
       allocation.width = column->width;
       width += column->width;
@@ -1838,7 +1834,13 @@ pspp_sheet_view_size_allocate_columns (GtkWidget *widget,
       if (column->width > old_width)
         column_changed = TRUE;
 
-      gtk_widget_size_allocate (column->button, &allocation);
+      pspp_sheet_view_column_size_allocate (column, &allocation);
+
+      if (span_intersects (allocation.x, allocation.width,
+                           tree_view->priv->hadjustment->value,
+                           widget->allocation.width)
+          && gtk_widget_get_realized (widget))
+        pspp_sheet_view_column_set_need_button (column, TRUE);
 
       if (column->window)
        gdk_window_move_resize (column->window,
@@ -2169,6 +2171,61 @@ pspp_sheet_view_row_head_clicked (PsppSheetView *tree_view,
   return handled;
 }
 
+static gboolean
+find_click (PsppSheetView *tree_view,
+            gint x, gint y,
+            gint *node,
+            PsppSheetViewColumn **column,
+            GdkRectangle *background_area,
+            GdkRectangle *cell_area)
+{
+  gint y_offset;
+  gboolean rtl;
+  GList *list;
+  gint new_y;
+
+  /* find the node that was clicked */
+  new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, y);
+  if (new_y < 0)
+    new_y = 0;
+  y_offset = -pspp_sheet_view_find_offset (tree_view, new_y, node);
+
+  if (*node < 0)
+    return FALSE;
+
+  background_area->y = y_offset + y;
+  background_area->height = ROW_HEIGHT (tree_view);
+  background_area->x = 0;
+
+  /* Let the column have a chance at selecting it. */
+  rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
+  for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
+       list; list = (rtl ? list->prev : list->next))
+    {
+      PsppSheetViewColumn *candidate = list->data;
+
+      if (!candidate->visible)
+        continue;
+
+      background_area->width = candidate->width;
+      if ((background_area->x > x) ||
+          (background_area->x + background_area->width <= x))
+        {
+          background_area->x += background_area->width;
+          continue;
+        }
+
+      /* we found the focus column */
+
+      pspp_sheet_view_adjust_cell_area (tree_view, candidate, background_area,
+                                        TRUE, cell_area);
+      *column = candidate;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static gboolean
 pspp_sheet_view_button_press (GtkWidget      *widget,
                            GdkEventButton *event)
@@ -2179,16 +2236,10 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
   gint i;
   GdkRectangle background_area;
   GdkRectangle cell_area;
-  gint vertical_separator;
-  gint horizontal_separator;
   gboolean rtl;
 
   rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
   pspp_sheet_view_stop_editing (tree_view, FALSE);
-  gtk_widget_style_get (widget,
-                       "vertical-separator", &vertical_separator,
-                       "horizontal-separator", &horizontal_separator,
-                       NULL);
 
 
   /* Because grab_focus can cause reentrancy, we delay grab_focus until after
@@ -2199,19 +2250,12 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
     {
       int node;
       GtkTreePath *path;
-      gchar *path_string;
-      gint depth;
-      gint new_y;
-      gint y_offset;
       gint dval;
       gint pre_val, aft_val;
       PsppSheetViewColumn *column = NULL;
       GtkCellRenderer *focus_cell = NULL;
-      gint column_handled_click = FALSE;
       gboolean row_double_click = FALSE;
-      gboolean rtl;
       gboolean node_selected;
-      guint modifiers;
 
       /* Empty tree? */
       if (tree_view->priv->row_count == 0)
@@ -2220,135 +2264,15 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
          return TRUE;
        }
 
-      /* find the node that was clicked */
-      new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, event->y);
-      if (new_y < 0)
-       new_y = 0;
-      y_offset = -pspp_sheet_view_find_offset (tree_view, new_y, &node);
-
-      if (node < 0)
-       {
-         /* We clicked in dead space */
-         grab_focus_and_unset_draw_keyfocus (tree_view);
-         return TRUE;
-       }
-
-      /* Get the path and the node */
-      path = _pspp_sheet_view_find_path (tree_view, node);
-
-      depth = gtk_tree_path_get_depth (path);
-      background_area.y = y_offset + event->y;
-      background_area.height = ROW_HEIGHT (tree_view);
-      background_area.x = 0;
-
-
-      /* Let the column have a chance at selecting it. */
-      rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
-      for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
-          list; list = (rtl ? list->prev : list->next))
-       {
-         PsppSheetViewColumn *candidate = list->data;
-
-         if (!candidate->visible)
-           continue;
-
-         background_area.width = candidate->width;
-         if ((background_area.x > (gint) event->x) ||
-             (background_area.x + background_area.width <= (gint) event->x))
-           {
-             background_area.x += background_area.width;
-             continue;
-           }
-
-         /* we found the focus column */
-         column = candidate;
-         cell_area = background_area;
-         cell_area.width -= horizontal_separator;
-         cell_area.height -= vertical_separator;
-         cell_area.x += horizontal_separator/2;
-         cell_area.y += vertical_separator/2;
-         break;
-       }
-
-      if (column == NULL)
-       {
-         gtk_tree_path_free (path);
+      if (!find_click (tree_view, event->x, event->y, &node, &column,
+                       &background_area, &cell_area))
+        {
          grab_focus_and_unset_draw_keyfocus (tree_view);
-         return FALSE;
-       }
+          return FALSE;
+        }
 
       tree_view->priv->focus_column = column;
 
-      /* decide if we edit */
-      modifiers = event->state & gtk_accelerator_get_default_mod_mask ();
-      if (event->type == GDK_BUTTON_PRESS && event->button == 1 && !modifiers)
-       {
-         GtkTreePath *anchor;
-         GtkTreeIter iter;
-
-         gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-         pspp_sheet_view_column_cell_set_cell_data (column,
-                                                  tree_view->priv->model,
-                                                  &iter);
-
-         if (tree_view->priv->anchor)
-           anchor = gtk_tree_row_reference_get_path (tree_view->priv->anchor);
-         else
-           anchor = NULL;
-
-         if (pspp_sheet_view_column_get_quick_edit (column)
-              //|| (anchor && !gtk_tree_path_compare (anchor, path))
-              || !_pspp_sheet_view_column_has_editable_cell (column))
-           {
-             GtkCellEditable *cell_editable = NULL;
-
-             /* FIXME: get the right flags */
-             guint flags = 0;
-
-             path_string = gtk_tree_path_to_string (path);
-
-             if (_pspp_sheet_view_column_cell_event (column,
-                                                   &cell_editable,
-                                                   (GdkEvent *)event,
-                                                   path_string,
-                                                   &background_area,
-                                                   &cell_area, flags))
-               {
-                 if (cell_editable != NULL)
-                   {
-                     gint left, right;
-                     GdkRectangle area;
-
-                      pspp_sheet_view_real_set_cursor (tree_view, path,
-                                                       TRUE, TRUE);
-                      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-
-                     area = cell_area;
-                     _pspp_sheet_view_column_get_neighbor_sizes (column,       _pspp_sheet_view_column_get_edited_cell (column), &left, &right);
-
-                     area.x += left;
-                     area.width -= right + left;
-
-                     pspp_sheet_view_real_start_editing (tree_view,
-                                                       column,
-                                                       path,
-                                                       cell_editable,
-                                                       &area,
-                                                       (GdkEvent *)event,
-                                                       flags);
-                     g_free (path_string);
-                     gtk_tree_path_free (path);
-                     gtk_tree_path_free (anchor);
-                     return TRUE;
-                   }
-                 column_handled_click = TRUE;
-               }
-             g_free (path_string);
-           }
-         if (anchor)
-           gtk_tree_path_free (anchor);
-       }
-
       if (pspp_sheet_view_row_head_clicked (tree_view, node, column, event))
         return TRUE;
 
@@ -2356,6 +2280,8 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
       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);
+
       /* we only handle selection modifications on the first button press
        */
       if (event->type == GDK_BUTTON_PRESS)
@@ -2408,13 +2334,13 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
 
       /* Save press to possibly begin a drag
        */
-      if (!column_handled_click &&
-         !tree_view->priv->in_grab &&
+      if (!tree_view->priv->in_grab &&
          tree_view->priv->pressed_button < 0)
         {
           tree_view->priv->pressed_button = event->button;
           tree_view->priv->press_start_x = event->x;
           tree_view->priv->press_start_y = event->y;
+          tree_view->priv->press_start_node = node;
 
          if (tree_view->priv->rubber_banding_enable
              //&& !node_selected
@@ -2510,7 +2436,7 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
 
          gtk_grab_add (widget);
          PSPP_SHEET_VIEW_SET_FLAG (tree_view, PSPP_SHEET_VIEW_IN_COLUMN_RESIZE);
-         column->resized_width = column->width - tree_view->priv->last_extra_space_per_column;
+         column->resized_width = column->width;
 
          /* block attached dnd signal handler */
          drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
@@ -2521,7 +2447,7 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
                                             drag_data);
 
          tree_view->priv->drag_pos = i;
-         tree_view->priv->x_drag = column->button->allocation.x + (rtl ? 0 : column->button->allocation.width);
+         tree_view->priv->x_drag = column->allocation.x + (rtl ? 0 : column->allocation.width);
 
          if (!gtk_widget_has_focus (widget))
            gtk_widget_grab_focus (widget);
@@ -2548,6 +2474,8 @@ pspp_sheet_view_button_release_drag_column (GtkWidget      *widget,
   gdk_display_keyboard_ungrab (gtk_widget_get_display (widget), GDK_CURRENT_TIME);
 
   /* Move the button back */
+  g_return_val_if_fail (tree_view->priv->drag_column->button, FALSE);
+
   g_object_ref (tree_view->priv->drag_column->button);
   gtk_container_remove (GTK_CONTAINER (tree_view), tree_view->priv->drag_column->button);
   gtk_widget_set_parent_window (tree_view->priv->drag_column->button, tree_view->priv->header_window);
@@ -2624,22 +2552,97 @@ pspp_sheet_view_button_release_column_resize (GtkWidget      *widget,
   return TRUE;
 }
 
+static gboolean
+pspp_sheet_view_button_release_edit (PsppSheetView *tree_view,
+                                     GdkEventButton *event)
+{
+  GtkCellEditable *cell_editable;
+  gchar *path_string;
+  GtkTreePath *path;
+  gint left, right;
+  GtkTreeIter iter;
+  PsppSheetViewColumn *column;
+  GdkRectangle background_area;
+  GdkRectangle cell_area;
+  GdkRectangle area;
+  guint modifiers;
+  guint flags;
+  int node;
+
+  if (event->window != tree_view->priv->bin_window)
+    return FALSE;
+
+  if (!find_click (tree_view, event->x, event->y, &node, &column, &background_area,
+                   &cell_area))
+    return FALSE;
+
+  /* decide if we edit */
+  path = _pspp_sheet_view_find_path (tree_view, node);
+  modifiers = event->state & gtk_accelerator_get_default_mod_mask ();
+  if (event->button != 1 || modifiers)
+    return FALSE;
+
+  gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+  pspp_sheet_view_column_cell_set_cell_data (column,
+                                             tree_view->priv->model,
+                                             &iter);
+
+  if (!pspp_sheet_view_column_get_quick_edit (column)
+      && _pspp_sheet_view_column_has_editable_cell (column))
+    return FALSE;
+
+  flags = 0;                    /* FIXME: get the right flags */
+  path_string = gtk_tree_path_to_string (path);
+
+  if (!_pspp_sheet_view_column_cell_event (column,
+                                           &cell_editable,
+                                           (GdkEvent *)event,
+                                           path_string,
+                                           &background_area,
+                                           &cell_area, flags))
+    return FALSE;
+
+  if (cell_editable == NULL)
+    return FALSE;
+
+  pspp_sheet_view_real_set_cursor (tree_view, path,
+                                   TRUE, TRUE);
+  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+
+  area = cell_area;
+  _pspp_sheet_view_column_get_neighbor_sizes (
+    column, _pspp_sheet_view_column_get_edited_cell (column), &left, &right);
+
+  area.x += left;
+  area.width -= right + left;
+
+  pspp_sheet_view_real_start_editing (tree_view,
+                                      column,
+                                      path,
+                                      cell_editable,
+                                      &area,
+                                      (GdkEvent *)event,
+                                      flags);
+  g_free (path_string);
+  gtk_tree_path_free (path);
+  return TRUE;
+}
+
 static gboolean
 pspp_sheet_view_button_release (GtkWidget      *widget,
                              GdkEventButton *event)
 {
   PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
 
-  if (tree_view->priv->edited_column &&
-      tree_view->priv->edited_column->editable_widget)
+  pspp_sheet_view_stop_editing (tree_view, FALSE);
+  if (tree_view->priv->rubber_band_status != RUBBER_BAND_ACTIVE
+      && pspp_sheet_view_button_release_edit (tree_view, event))
     {
-      /* When a column is in quick-edit mode, the initial button press that
-       * starts editing implicitly grabs the pointer, so that the corresponding
-       * release doesn't get passed along to the GtkWidget created by the
-       * press.  Pass the release along explicitly. */
-      gtk_widget_event (GTK_WIDGET (tree_view->priv->edited_column->editable_widget),
-                        (GdkEvent *) event);
-      return FALSE;
+      if (tree_view->priv->pressed_button == event->button)
+        tree_view->priv->pressed_button = -1;
+
+      tree_view->priv->rubber_band_status = RUBBER_BAND_OFF;
+      return TRUE;
     }
 
   if (PSPP_SHEET_VIEW_FLAG_SET (tree_view, PSPP_SHEET_VIEW_IN_COLUMN_DRAG))
@@ -2820,9 +2823,9 @@ pspp_sheet_view_motion_draw_column_motion_arrow (PsppSheetView *tree_view)
       GdkRectangle visible_rect;
       pspp_sheet_view_get_visible_rect (tree_view, &visible_rect);
       if (reorder->left_column)
-       x = reorder->left_column->button->allocation.x + reorder->left_column->button->allocation.width;
+       x = reorder->left_column->allocation.x + reorder->left_column->allocation.width;
       else
-       x = reorder->right_column->button->allocation.x;
+       x = reorder->right_column->allocation.x;
 
       if (x < visible_rect.x)
        arrow_type = DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT;
@@ -2851,8 +2854,8 @@ pspp_sheet_view_motion_draw_column_motion_arrow (PsppSheetView *tree_view)
          attributes.wclass = GDK_INPUT_OUTPUT;
           attributes.x = tree_view->priv->drag_column_x;
           attributes.y = 0;
-         width = attributes.width = tree_view->priv->drag_column->button->allocation.width;
-         height = attributes.height = tree_view->priv->drag_column->button->allocation.height;
+         width = attributes.width = tree_view->priv->drag_column->allocation.width;
+         height = attributes.height = tree_view->priv->drag_column->allocation.height;
          attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
          attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
          attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
@@ -2888,13 +2891,13 @@ pspp_sheet_view_motion_draw_column_motion_arrow (PsppSheetView *tree_view)
       gdk_window_get_origin (tree_view->priv->header_window, &x, &y);
       if (reorder->left_column)
        {
-         x += reorder->left_column->button->allocation.x + reorder->left_column->button->allocation.width - width/2;
-         height = reorder->left_column->button->allocation.height;
+         x += reorder->left_column->allocation.x + reorder->left_column->allocation.width - width/2;
+         height = reorder->left_column->allocation.height;
        }
       else
        {
-         x += reorder->right_column->button->allocation.x - width/2;
-         height = reorder->right_column->button->allocation.height;
+         x += reorder->right_column->allocation.x - width/2;
+         height = reorder->right_column->allocation.height;
        }
       y -= tree_view->priv->expander_size/2; /* The arrow takes up only half the space */
       height += tree_view->priv->expander_size;
@@ -2967,9 +2970,9 @@ pspp_sheet_view_motion_draw_column_motion_arrow (PsppSheetView *tree_view)
        x += widget->allocation.width - width;
 
       if (reorder->left_column)
-       height = reorder->left_column->button->allocation.height;
+       height = reorder->left_column->allocation.height;
       else
-       height = reorder->right_column->button->allocation.height;
+       height = reorder->right_column->allocation.height;
 
       y -= tree_view->priv->expander_size;
       height += 2*tree_view->priv->expander_size;
@@ -3066,8 +3069,10 @@ pspp_sheet_view_motion_resize_column (GtkWidget      *widget,
     {
       column->use_resized_width = TRUE;
       column->resized_width = new_width;
+#if 0
       if (column->expand)
        column->resized_width -= tree_view->priv->last_extra_space_per_column;
+#endif
       gtk_widget_queue_resize (widget);
     }
 
@@ -3171,7 +3176,7 @@ pspp_sheet_view_motion_drag_column (GtkWidget      *widget,
   /* Handle moving the header */
   gdk_window_get_position (tree_view->priv->drag_window, &x, &y);
   x = CLAMP (x + (gint)event->x - column->drag_x, 0,
-            MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width) - column->button->allocation.width);
+            MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width) - column->allocation.width);
   gdk_window_move (tree_view->priv->drag_window, x, y);
   
   /* autoscroll, if needed */
@@ -3532,6 +3537,15 @@ pspp_sheet_view_motion_bin_window (GtkWidget      *widget,
 
   if (tree_view->priv->rubber_band_status == RUBBER_BAND_MAYBE_START)
     {
+      GdkRectangle background_area, cell_area;
+      PsppSheetViewColumn *column;
+
+      if (find_click (tree_view, event->x, event->y, &node, &column,
+                      &background_area, &cell_area)
+          && tree_view->priv->focus_column == column
+          && tree_view->priv->press_start_node == node)
+        return FALSE;
+
       gtk_grab_add (GTK_WIDGET (tree_view));
       pspp_sheet_view_update_rubber_band (tree_view);
 
@@ -3633,7 +3647,9 @@ draw_empty_focus (PsppSheetView *tree_view, GdkRectangle *clip_area)
 static void
 pspp_sheet_view_draw_grid_lines (PsppSheetView    *tree_view,
                               GdkEventExpose *event,
-                              gint            n_visible_columns)
+                                 gint            n_visible_columns,
+                                 gint min_y,
+                                 gint max_y)
 {
   GList *list = tree_view->priv->columns;
   gint i = 0;
@@ -3664,8 +3680,8 @@ pspp_sheet_view_draw_grid_lines (PsppSheetView    *tree_view,
           && current_x - 1 < event->area.x + event->area.width)
         gdk_draw_line (event->window,
                        tree_view->priv->grid_line_gc,
-                       current_x - 1, 0,
-                       current_x - 1, height);
+                       current_x - 1, min_y,
+                       current_x - 1, max_y - min_y);
     }
 }
 
@@ -3708,6 +3724,7 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   gint grid_line_width;
   gboolean row_ending_details;
   gboolean draw_vgrid_lines, draw_hgrid_lines;
+  gint min_y, max_y;
 
   rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
 
@@ -3815,6 +3832,7 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
    * order, drawing each successive node.
    */
 
+  min_y = y_offset;
   do
     {
       gboolean parity;
@@ -3829,6 +3847,7 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 
       background_area.y = y_offset + event->area.y;
       background_area.height = max_height;
+      max_y = background_area.y + max_height;
 
       flags = 0;
 
@@ -3839,21 +3858,26 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 
       parity = node % 2;
 
-      /* we *need* to set cell data on all cells before the call
-       * to _has_special_cell, else _has_special_cell() does not
-       * return a correct value.
-       */
-      for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
-          list;
-          list = (rtl ? list->prev : list->next))
+      if (tree_view->priv->special_cells == PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT)
         {
-         PsppSheetViewColumn *column = list->data;
-         pspp_sheet_view_column_cell_set_cell_data (column,
-                                                  tree_view->priv->model,
-                                                  &iter);
-        }
+          /* we *need* to set cell data on all cells before the call
+           * to _has_special_cell, else _has_special_cell() does not
+           * return a correct value.
+           */
+          for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
+               list;
+               list = (rtl ? list->prev : list->next))
+            {
+              PsppSheetViewColumn *column = list->data;
+              pspp_sheet_view_column_cell_set_cell_data (column,
+                                                         tree_view->priv->model,
+                                                         &iter);
+            }
 
-      has_special_cell = pspp_sheet_view_has_special_cell (tree_view);
+          has_special_cell = pspp_sheet_view_has_special_cell (tree_view);
+        }
+      else
+        has_special_cell = tree_view->priv->special_cells == PSPP_SHEET_VIEW_SPECIAL_CELLS_YES;
 
       for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
           list;
@@ -4075,6 +4099,21 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
          cell_offset += column->width;
        }
 
+      if (cell_offset < event->area.x)
+        {
+          gtk_paint_flat_box (widget->style,
+                              event->window,
+                              GTK_STATE_NORMAL,
+                              GTK_SHADOW_NONE,
+                              &event->area,
+                              widget,
+                              "base",
+                              cell_offset,
+                              background_area.y,
+                              event->area.x - cell_offset,
+                              background_area.height);
+        }
+
       if (node == drag_highlight)
         {
           /* Draw indicator for the drop
@@ -4214,7 +4253,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   while (y_offset < event->area.height);
 
 done:
-  pspp_sheet_view_draw_grid_lines (tree_view, event, n_visible_columns);
+  pspp_sheet_view_draw_grid_lines (tree_view, event, n_visible_columns,
+                                   min_y, max_y);
 
  if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
    {
@@ -4242,7 +4282,7 @@ done:
 
 static gboolean
 pspp_sheet_view_expose (GtkWidget      *widget,
-                     GdkEventExpose *event)
+                        GdkEventExpose *event)
 {
   PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
 
@@ -4271,20 +4311,47 @@ pspp_sheet_view_expose (GtkWidget      *widget,
 
   else if (event->window == tree_view->priv->header_window)
     {
+      gint n_visible_columns;
       GList *list;
-      
+
+      gtk_paint_flat_box (widget->style,
+                          event->window,
+                          GTK_STATE_NORMAL,
+                          GTK_SHADOW_NONE,
+                          &event->area,
+                          widget,
+                          "cell_odd",
+                          event->area.x,
+                          event->area.y,
+                          event->area.width,
+                          event->area.height);
+
       for (list = tree_view->priv->columns; list != NULL; list = list->next)
        {
          PsppSheetViewColumn *column = list->data;
 
-         if (column == tree_view->priv->drag_column)
+         if (column == tree_view->priv->drag_column || !column->visible)
            continue;
 
-         if (column->visible)
-           gtk_container_propagate_expose (GTK_CONTAINER (tree_view),
-                                           column->button,
-                                           event);
+          if (span_intersects (column->allocation.x, column->allocation.width,
+                               event->area.x, event->area.width)
+              && column->button != NULL)
+            gtk_container_propagate_expose (GTK_CONTAINER (tree_view),
+                                            column->button, event);
        }
+
+      n_visible_columns = 0;
+      for (list = tree_view->priv->columns; list; list = list->next)
+        {
+          if (! PSPP_SHEET_VIEW_COLUMN (list->data)->visible)
+            continue;
+          n_visible_columns ++;
+        }
+      pspp_sheet_view_draw_grid_lines (tree_view,
+                                       event,
+                                       n_visible_columns,
+                                       event->area.y,
+                                       event->area.height);
     }
   else if (event->window == tree_view->priv->drag_window)
     {
@@ -4542,7 +4609,7 @@ pspp_sheet_view_key_press (GtkWidget   *widget,
         {
           PsppSheetViewColumn *column = PSPP_SHEET_VIEW_COLUMN (focus_column->data);
 
-          if (gtk_widget_has_focus (column->button))
+          if (column->button && gtk_widget_has_focus (column->button))
             break;
         }
 
@@ -4571,7 +4638,7 @@ pspp_sheet_view_key_press (GtkWidget   *widget,
                 column->resized_width = 0;
 
               if (column->min_width == -1)
-                column->resized_width = MAX (column->button->requisition.width,
+                column->resized_width = MAX (column->button_request,
                                              column->resized_width);
               else
                 column->resized_width = MAX (column->min_width,
@@ -6412,6 +6479,9 @@ pspp_sheet_view_has_special_cell (PsppSheetView *tree_view)
 {
   GList *list;
 
+  if (tree_view->priv->special_cells != PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT)
+    return tree_view->priv->special_cells = PSPP_SHEET_VIEW_SPECIAL_CELLS_YES;
+
   for (list = tree_view->priv->columns; list; list = list->next)
     {
       if (!((PsppSheetViewColumn *)list->data)->visible)
@@ -6423,6 +6493,27 @@ pspp_sheet_view_has_special_cell (PsppSheetView *tree_view)
   return FALSE;
 }
 
+static void
+pspp_sheet_view_focus_column (PsppSheetView *tree_view,
+                              PsppSheetViewColumn *focus_column,
+                              gboolean clamp_column_visible)
+{
+  g_return_if_fail (focus_column != NULL);
+
+  tree_view->priv->focus_column = focus_column;
+  if (!focus_column->button)
+    {
+      pspp_sheet_view_column_set_need_button (focus_column, TRUE);
+      g_return_if_fail (focus_column->button != NULL);
+    }
+
+  if (GTK_CONTAINER (tree_view)->focus_child != focus_column->button)
+    gtk_widget_grab_focus (focus_column->button);
+
+  if (clamp_column_visible)
+    pspp_sheet_view_clamp_column_visible (tree_view, focus_column, FALSE);
+}
+
 /* Returns TRUE if the focus is within the headers, after the focus operation is
  * done
  */
@@ -6432,7 +6523,7 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
                            gboolean          clamp_column_visible)
 {
   GtkWidget *focus_child;
-
+  PsppSheetViewColumn *focus_column;
   GList *last_column, *first_column;
   GList *tmp_list;
   gboolean rtl;
@@ -6445,10 +6536,9 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
   first_column = tree_view->priv->columns;
   while (first_column)
     {
-      if (gtk_widget_get_can_focus (PSPP_SHEET_VIEW_COLUMN (first_column->data)->button) &&
-         PSPP_SHEET_VIEW_COLUMN (first_column->data)->visible &&
-         (PSPP_SHEET_VIEW_COLUMN (first_column->data)->clickable ||
-          PSPP_SHEET_VIEW_COLUMN (first_column->data)->reorderable))
+      PsppSheetViewColumn *c = PSPP_SHEET_VIEW_COLUMN (first_column->data);
+
+      if (pspp_sheet_view_column_can_focus (c) && c->visible)
        break;
       first_column = first_column->next;
     }
@@ -6461,10 +6551,9 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
   last_column = g_list_last (tree_view->priv->columns);
   while (last_column)
     {
-      if (gtk_widget_get_can_focus (PSPP_SHEET_VIEW_COLUMN (last_column->data)->button) &&
-         PSPP_SHEET_VIEW_COLUMN (last_column->data)->visible &&
-         (PSPP_SHEET_VIEW_COLUMN (last_column->data)->clickable ||
-          PSPP_SHEET_VIEW_COLUMN (last_column->data)->reorderable))
+      PsppSheetViewColumn *c = PSPP_SHEET_VIEW_COLUMN (last_column->data);
+
+      if (pspp_sheet_view_column_can_focus (c) && c->visible)
        break;
       last_column = last_column->prev;
     }
@@ -6481,12 +6570,13 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
       if (focus_child == NULL)
        {
          if (tree_view->priv->focus_column != NULL &&
-              gtk_widget_get_can_focus (tree_view->priv->focus_column->button))
-           focus_child = tree_view->priv->focus_column->button;
+              pspp_sheet_view_column_can_focus (tree_view->priv->focus_column))
+           focus_column = tree_view->priv->focus_column;
          else
-           focus_child = PSPP_SHEET_VIEW_COLUMN (first_column->data)->button;
-         gtk_widget_grab_focus (focus_child);
-         break;
+            focus_column = first_column->data;
+          pspp_sheet_view_focus_column (tree_view, focus_column,
+                                        clamp_column_visible);
+         return TRUE;
        }
       return FALSE;
 
@@ -6495,20 +6585,25 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
       if (focus_child == NULL)
        {
          if (tree_view->priv->focus_column != NULL)
-           focus_child = tree_view->priv->focus_column->button;
+           focus_column = tree_view->priv->focus_column;
          else if (dir == GTK_DIR_LEFT)
-           focus_child = PSPP_SHEET_VIEW_COLUMN (last_column->data)->button;
+           focus_column = last_column->data;
          else
-           focus_child = PSPP_SHEET_VIEW_COLUMN (first_column->data)->button;
-         gtk_widget_grab_focus (focus_child);
-         break;
+           focus_column = first_column->data;
+          pspp_sheet_view_focus_column (tree_view, focus_column,
+                                        clamp_column_visible);
+         return TRUE;
        }
 
       if (gtk_widget_child_focus (focus_child, dir))
        {
          /* The focus moves inside the button. */
          /* This is probably a great example of bad UI */
-         break;
+          if (clamp_column_visible)
+            pspp_sheet_view_clamp_column_visible (tree_view,
+                                                  tree_view->priv->focus_column,
+                                                  FALSE);
+         return TRUE;
        }
 
       /* We need to move the focus among the row of buttons. */
@@ -6520,7 +6615,7 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
          || (tmp_list == last_column && dir == (rtl ? GTK_DIR_LEFT : GTK_DIR_RIGHT)))
         {
          gtk_widget_error_bell (GTK_WIDGET (tree_view));
-         break;
+         return TRUE;
        }
 
       while (tmp_list)
@@ -6540,39 +6635,21 @@ pspp_sheet_view_header_focus (PsppSheetView      *tree_view,
          column = tmp_list->data;
          if (column->button &&
              column->visible &&
-             gtk_widget_get_can_focus (column->button))
+             pspp_sheet_view_column_can_focus (column))
            {
-             focus_child = column->button;
-             gtk_widget_grab_focus (column->button);
-             break;
+              pspp_sheet_view_focus_column (tree_view, column,
+                                            clamp_column_visible);
+              return TRUE;
            }
        }
-      break;
+      return FALSE;
+
     default:
       g_assert_not_reached ();
       break;
     }
 
-  /* if focus child is non-null, we assume it's been set to the current focus child
-   */
-  if (focus_child)
-    {
-      for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
-       if (PSPP_SHEET_VIEW_COLUMN (tmp_list->data)->button == focus_child)
-         {
-           tree_view->priv->focus_column = PSPP_SHEET_VIEW_COLUMN (tmp_list->data);
-           break;
-         }
-
-      if (clamp_column_visible)
-        {
-         pspp_sheet_view_clamp_column_visible (tree_view,
-                                             tree_view->priv->focus_column,
-                                             FALSE);
-       }
-    }
-
-  return (focus_child != NULL);
+  return FALSE;
 }
 
 /* This function returns in 'path' the first focusable path, if the given path
@@ -6696,6 +6773,13 @@ pspp_sheet_view_style_set (GtkWidget *widget,
 
   tree_view->priv->fixed_height = -1;
 
+  /* Invalidate cached button style. */
+  if (tree_view->priv->button_style)
+    {
+      g_object_unref (tree_view->priv->button_style);
+      tree_view->priv->button_style = NULL;
+    }
+
   gtk_widget_queue_resize (widget);
 }
 
@@ -7180,8 +7264,8 @@ pspp_sheet_view_clamp_column_visible (PsppSheetView       *tree_view,
   if (column == NULL)
     return;
 
-  x = column->button->allocation.x;
-  width = column->button->allocation.width;
+  x = column->allocation.x;
+  width = column->allocation.width;
 
   if (width > tree_view->priv->hadjustment->page_size)
     {
@@ -7391,9 +7475,9 @@ pspp_sheet_view_set_column_drag_info (PsppSheetView       *tree_view,
       if (tmp_list->next != NULL)
        {
          g_assert (tmp_list->next->data);
-         left = reorder->right_align = (reorder->right_column->button->allocation.x +
-                                        reorder->right_column->button->allocation.width +
-                                        ((PsppSheetViewColumnReorder *)tmp_list->next->data)->left_column->button->allocation.x)/2;
+         left = reorder->right_align = (reorder->right_column->allocation.x +
+                                        reorder->right_column->allocation.width +
+                                        ((PsppSheetViewColumnReorder *)tmp_list->next->data)->left_column->allocation.x)/2;
        }
       else
        {
@@ -7417,6 +7501,7 @@ _pspp_sheet_view_column_start_drag (PsppSheetView       *tree_view,
 
   g_return_if_fail (tree_view->priv->column_drag_info == NULL);
   g_return_if_fail (tree_view->priv->cur_reorder == NULL);
+  g_return_if_fail (column->button);
 
   pspp_sheet_view_set_column_drag_info (tree_view, column);
 
@@ -7430,10 +7515,10 @@ _pspp_sheet_view_column_start_drag (PsppSheetView       *tree_view,
 
       attributes.window_type = GDK_WINDOW_CHILD;
       attributes.wclass = GDK_INPUT_OUTPUT;
-      attributes.x = column->button->allocation.x;
+      attributes.x = column->allocation.x;
       attributes.y = 0;
-      attributes.width = column->button->allocation.width;
-      attributes.height = column->button->allocation.height;
+      attributes.width = column->allocation.width;
+      attributes.height = column->allocation.height;
       attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
       attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
       attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
@@ -7483,8 +7568,8 @@ _pspp_sheet_view_column_start_drag (PsppSheetView       *tree_view,
   gtk_widget_set_parent (column->button, GTK_WIDGET (tree_view));
   g_object_unref (column->button);
 
-  tree_view->priv->drag_column_x = column->button->allocation.x;
-  allocation = column->button->allocation;
+  tree_view->priv->drag_column_x = column->allocation.x;
+  allocation = column->allocation;
   allocation.x = 0;
   gtk_widget_size_allocate (column->button, &allocation);
   gtk_widget_set_parent_window (column->button, tree_view->priv->drag_window);
@@ -8275,7 +8360,7 @@ pspp_sheet_view_real_start_interactive_search (PsppSheetView *tree_view,
       if (! column->visible)
        continue;
 
-      if (gtk_widget_has_focus (column->button))
+      if (column->button && gtk_widget_has_focus (column->button))
        {
          found_focus = TRUE;
          break;
@@ -8351,19 +8436,17 @@ pspp_sheet_view_new_column_width (PsppSheetView *tree_view,
    */
   rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
   column = g_list_nth (tree_view->priv->columns, i)->data;
-  width = rtl ? (column->button->allocation.x + column->button->allocation.width - *x) : (*x - column->button->allocation.x);
+  width = rtl ? (column->allocation.x + column->allocation.width - *x) : (*x - column->allocation.x);
  
   /* Clamp down the value */
   if (column->min_width == -1)
-    width = MAX (column->button->requisition.width,
-                width);
+    width = MAX (column->button_request, width);
   else
-    width = MAX (column->min_width,
-                width);
+    width = MAX (column->min_width, width);
   if (column->max_width != -1)
     width = MIN (width, column->max_width);
 
-  *x = rtl ? (column->button->allocation.x + column->button->allocation.width - width) : (column->button->allocation.x + width);
+  *x = rtl ? (column->allocation.x + column->allocation.width - width) : (column->allocation.x + width);
  
   return width;
 }
@@ -8440,6 +8523,9 @@ adjust_allocation (GtkWidget *widget,
   adjust_allocation_recurse (widget, &scroll_data);
 }
 
+void 
+pspp_sheet_view_column_update_button (PsppSheetViewColumn *tree_column);
+
 /* Callbacks */
 static void
 pspp_sheet_view_adjustment_changed (GtkAdjustment *adjustment,
@@ -8447,6 +8533,7 @@ pspp_sheet_view_adjustment_changed (GtkAdjustment *adjustment,
 {
   if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
     {
+      GList *list;
       gint dy;
        
       gdk_window_move (tree_view->priv->bin_window,
@@ -8494,8 +8581,20 @@ pspp_sheet_view_adjustment_changed (GtkAdjustment *adjustment,
             pspp_sheet_view_dy_to_top_row (tree_view);
        }
 
-      gdk_window_process_updates (tree_view->priv->header_window, TRUE);
-      gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
+      for (list = tree_view->priv->columns; list; list = list->next)
+        {
+          PsppSheetViewColumn *column = list->data;
+          GtkAllocation *allocation = &column->allocation;
+
+          if (span_intersects (allocation->x, allocation->width,
+                               tree_view->priv->hadjustment->value,
+                               GTK_WIDGET (tree_view)->allocation.width))
+            {
+              pspp_sheet_view_column_set_need_button (column, TRUE);
+              if (!column->button)
+                pspp_sheet_view_column_update_button (column);
+            }
+        }
     }
 }
 
@@ -8839,7 +8938,8 @@ pspp_sheet_view_set_headers_visible (PsppSheetView *tree_view,
          for (list = tree_view->priv->columns; list; list = list->next)
            {
              column = list->data;
-             gtk_widget_unmap (column->button);
+              if (column->button)
+                gtk_widget_unmap (column->button);
            }
          gdk_window_hide (tree_view->priv->header_window);
        }
@@ -9946,6 +10046,121 @@ pspp_sheet_view_get_path_at_pos (PsppSheetView        *tree_view,
   return TRUE;
 }
 
+/* Computes 'cell_area' from 'background_area', which must be the background
+   area for a cell.  Set 'subtract_focus_rect' to TRUE to compute the cell area
+   as passed to a GtkCellRenderer's "render" function, or to FALSE to compute
+   the cell area as passed to _pspp_sheet_view_column_cell_render().
+
+   'column' is required to properly adjust 'cell_area->x' and
+   'cell_area->width'.  It may be set to NULL if these values are not of
+   interest.  In this case 'cell_area->x' and 'cell_area->width' will be
+   returned as 0. */
+static void
+pspp_sheet_view_adjust_cell_area (PsppSheetView        *tree_view,
+                                  PsppSheetViewColumn  *column,
+                                  const GdkRectangle   *background_area,
+                                  gboolean              subtract_focus_rect,
+                                  GdkRectangle         *cell_area)
+{
+  gint vertical_separator;
+  gint horizontal_separator;
+
+  *cell_area = *background_area;
+
+  gtk_widget_style_get (GTK_WIDGET (tree_view),
+                       "vertical-separator", &vertical_separator,
+                       "horizontal-separator", &horizontal_separator,
+                       NULL);
+  cell_area->x += horizontal_separator / 2;
+  cell_area->y += vertical_separator / 2;
+  cell_area->width -= horizontal_separator;
+  cell_area->height -= vertical_separator;
+
+  if (subtract_focus_rect)
+    {
+      int focus_line_width;
+
+      gtk_widget_style_get (GTK_WIDGET (tree_view),
+                            "focus-line-width", &focus_line_width,
+                            NULL);
+      cell_area->x += focus_line_width;
+      cell_area->y += focus_line_width;
+      cell_area->width -= 2 * focus_line_width;
+      cell_area->height -= 2 * focus_line_width;
+    }
+
+  if (tree_view->priv->grid_lines != PSPP_SHEET_VIEW_GRID_LINES_NONE)
+    {
+      gint grid_line_width;
+      gtk_widget_style_get (GTK_WIDGET (tree_view),
+                            "grid-line-width", &grid_line_width,
+                            NULL);
+
+      if ((tree_view->priv->grid_lines == PSPP_SHEET_VIEW_GRID_LINES_VERTICAL
+           || tree_view->priv->grid_lines == PSPP_SHEET_VIEW_GRID_LINES_BOTH)
+          && column != NULL)
+        {
+          PsppSheetViewColumn *first_column, *last_column;
+          GList *list;
+
+          /* Find the last visible column. */
+          last_column = NULL;
+          for (list = g_list_last (tree_view->priv->columns);
+               list;
+               list = list->prev)
+            {
+              PsppSheetViewColumn *c = list->data;
+              if (c->visible)
+                {
+                  last_column = c;
+                  break;
+                }
+            }
+
+          /* Find the first visible column. */
+          first_column = NULL;
+          for (list = g_list_first (tree_view->priv->columns);
+               list;
+               list = list->next)
+            {
+              PsppSheetViewColumn *c = list->data;
+              if (c->visible)
+                {
+                  first_column = c;
+                  break;
+                }
+            }
+
+          if (column == first_column)
+            {
+              cell_area->width -= grid_line_width / 2;
+            }
+          else if (column == last_column)
+            {
+              cell_area->x += grid_line_width / 2;
+              cell_area->width -= grid_line_width / 2;
+            }
+          else
+            {
+              cell_area->x += grid_line_width / 2;
+              cell_area->width -= grid_line_width;
+            }
+        }
+
+      if (tree_view->priv->grid_lines == PSPP_SHEET_VIEW_GRID_LINES_HORIZONTAL
+          || tree_view->priv->grid_lines == PSPP_SHEET_VIEW_GRID_LINES_BOTH)
+        {
+          cell_area->y += grid_line_width / 2;
+          cell_area->height -= grid_line_width;
+        }
+    }
+
+  if (column == NULL)
+    {
+      cell_area->x = 0;
+      cell_area->width = 0;
+    }
+}
 
 /**
  * pspp_sheet_view_get_cell_area:
@@ -9970,9 +10185,7 @@ pspp_sheet_view_get_cell_area (PsppSheetView        *tree_view,
                              PsppSheetViewColumn  *column,
                              GdkRectangle       *rect)
 {
-  int node = -1;
-  gint vertical_separator;
-  gint horizontal_separator;
+  GdkRectangle background_area;
 
   g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
   g_return_if_fail (column == NULL || PSPP_IS_SHEET_VIEW_COLUMN (column));
@@ -9980,33 +10193,10 @@ pspp_sheet_view_get_cell_area (PsppSheetView        *tree_view,
   g_return_if_fail (!column || column->tree_view == (GtkWidget *) tree_view);
   g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (tree_view)));
 
-  gtk_widget_style_get (GTK_WIDGET (tree_view),
-                       "vertical-separator", &vertical_separator,
-                       "horizontal-separator", &horizontal_separator,
-                       NULL);
-
-  rect->x = 0;
-  rect->y = 0;
-  rect->width = 0;
-  rect->height = 0;
-
-  if (column)
-    {
-      rect->x = column->button->allocation.x + horizontal_separator/2;
-      rect->width = column->button->allocation.width - horizontal_separator;
-    }
-
-  if (path)
-    {
-      _pspp_sheet_view_find_node (tree_view, path, &node);
-
-      /* Get vertical coords */
-      if (node < 0)
-       return;
-
-      rect->y = CELL_FIRST_PIXEL (tree_view, node, vertical_separator);
-      rect->height = MAX (CELL_HEIGHT (tree_view, vertical_separator), tree_view->priv->expander_size - vertical_separator);
-    }
+  pspp_sheet_view_get_background_area (tree_view, path, column,
+                                       &background_area);
+  pspp_sheet_view_adjust_cell_area (tree_view, column, &background_area,
+                                    FALSE, rect);
 }
 
 /**
@@ -12133,6 +12323,52 @@ pspp_sheet_view_set_grid_lines (PsppSheetView           *tree_view,
     }
 }
 
+/**
+ * pspp_sheet_view_get_special_cells:
+ * @tree_view: a #PsppSheetView
+ *
+ * Returns which grid lines are enabled in @tree_view.
+ *
+ * Return value: a #PsppSheetViewSpecialCells value indicating whether rows in
+ * the sheet view contain special cells.
+ */
+PsppSheetViewSpecialCells
+pspp_sheet_view_get_special_cells (PsppSheetView *tree_view)
+{
+  g_return_val_if_fail (PSPP_IS_SHEET_VIEW (tree_view), 0);
+
+  return tree_view->priv->special_cells;
+}
+
+/**
+ * pspp_sheet_view_set_special_cells:
+ * @tree_view: a #PsppSheetView
+ * @special_cells: a #PsppSheetViewSpecialCells value indicating whether rows in
+ * the sheet view contain special cells.
+ *
+ * Sets whether rows in the sheet view contain special cells, controlling the
+ * rendering of row selections.
+ */
+void
+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)
+    {
+      priv->special_cells = special_cells;
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+      g_object_notify (G_OBJECT (tree_view), "special-cells");
+    }
+}
+
 /**
  * pspp_sheet_view_set_tooltip_row:
  * @tree_view: a #PsppSheetView
@@ -12463,3 +12699,19 @@ pspp_sheet_view_grid_lines_get_type (void)
     }
     return etype;
 }
+
+GType
+pspp_sheet_view_special_cells_get_type (void)
+{
+    static GType etype = 0;
+    if (G_UNLIKELY(etype == 0)) {
+        static const GEnumValue values[] = {
+            { PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT, "PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT", "detect" },
+            { PSPP_SHEET_VIEW_SPECIAL_CELLS_YES, "PSPP_SHEET_VIEW_SPECIAL_CELLS_YES", "yes" },
+            { PSPP_SHEET_VIEW_SPECIAL_CELLS_NO, "PSPP_SHEET_VIEW_SPECIAL_CELLS_NO", "no" },
+            { 0, NULL, NULL }
+        };
+        etype = g_enum_register_static (g_intern_static_string ("PsppSheetViewSpecialCells"), values);
+    }
+    return etype;
+}