Remove variables assigned to but never used.

[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 5ddef9d821ed4de39ea16b56a780413d5c62e59b..c4eec5637c9e2664d4b3cee3c39840f20b9e59b0 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -144,7 +144,9 @@ enum {
   PROP_RUBBER_BANDING,
   PROP_ENABLE_GRID_LINES,
   PROP_TOOLTIP_COLUMN,
-  PROP_SPECIAL_CELLS
+  PROP_SPECIAL_CELLS,
+  PROP_FIXED_HEIGHT,
+  PROP_FIXED_HEIGHT_SET
 };
 
 /* object signals */
@@ -637,6 +639,24 @@ pspp_sheet_view_class_init (PsppSheetViewClass *class)
                                                        PSPP_SHEET_VIEW_SPECIAL_CELLS_DETECT,
                                                        GTK_PARAM_READWRITE));
 
+    g_object_class_install_property (o_class,
+                                    PROP_FIXED_HEIGHT,
+                                    g_param_spec_int ("fixed-height",
+                                                      P_("Fixed Height"),
+                                                      P_("Height of a single row.  Normally the height of a row is determined automatically.  Writing this property sets fixed-height-set to true, preventing this property's value from changing."),
+                                                      -1,
+                                                      G_MAXINT,
+                                                      -1,
+                                                      GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (o_class,
+                                     PROP_FIXED_HEIGHT_SET,
+                                     g_param_spec_boolean ("fixed-height-set",
+                                                           P_("Fixed Height Set"),
+                                                           P_("Whether fixed-height was set externally."),
+                                                           FALSE,
+                                                           GTK_PARAM_READWRITE));
+
   /* Style properties */
 #define _TREE_VIEW_EXPANDER_SIZE 12
 #define _TREE_VIEW_VERTICAL_SEPARATOR 2
@@ -994,6 +1014,7 @@ pspp_sheet_view_init (PsppSheetView *tree_view)
   tree_view->priv->presize_handler_timer = 0;
   tree_view->priv->scroll_sync_timer = 0;
   tree_view->priv->fixed_height = -1;
+  tree_view->priv->fixed_height_set = FALSE;
   pspp_sheet_view_set_adjustments (tree_view, NULL, NULL);
   tree_view->priv->selection = _pspp_sheet_selection_new_with_tree_view (tree_view);
   tree_view->priv->enable_search = TRUE;
@@ -1091,6 +1112,29 @@ pspp_sheet_view_set_property (GObject         *object,
     case PROP_SPECIAL_CELLS:
       pspp_sheet_view_set_special_cells (tree_view, g_value_get_enum (value));
       break;
+    case PROP_FIXED_HEIGHT:
+      pspp_sheet_view_set_fixed_height (tree_view, g_value_get_int (value));
+      break;
+    case PROP_FIXED_HEIGHT_SET:
+      if (g_value_get_boolean (value))
+        {
+          if (!tree_view->priv->fixed_height_set
+              && tree_view->priv->fixed_height >= 0)
+            {
+              tree_view->priv->fixed_height_set = true;
+              g_object_notify (G_OBJECT (tree_view), "fixed-height-set");
+            }
+        }
+      else
+        {
+          if (tree_view->priv->fixed_height_set)
+            {
+              tree_view->priv->fixed_height_set = false;
+              g_object_notify (G_OBJECT (tree_view), "fixed-height-set");
+              install_presize_handler (tree_view);
+            }
+        }
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1151,6 +1195,12 @@ pspp_sheet_view_get_property (GObject    *object,
     case PROP_SPECIAL_CELLS:
       g_value_set_enum (value, tree_view->priv->special_cells);
       break;
+    case PROP_FIXED_HEIGHT:
+      g_value_set_int (value, pspp_sheet_view_get_fixed_height (tree_view));
+      break;
+    case PROP_FIXED_HEIGHT_SET:
+      g_value_set_boolean (value, tree_view->priv->fixed_height_set);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -2253,7 +2303,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)
@@ -2275,7 +2324,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);
@@ -2341,7 +2389,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))
            {
@@ -3703,7 +3750,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;
@@ -3776,7 +3822,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;
@@ -4953,7 +4998,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;
@@ -5016,10 +5060,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)
@@ -5244,6 +5285,9 @@ initialize_fixed_height_mode (PsppSheetView *tree_view)
   if (!tree_view->priv->row_count)
     return;
 
+  if (tree_view->priv->fixed_height_set)
+    return;
+
   if (tree_view->priv->fixed_height < 0)
     {
       GtkTreeIter iter;
@@ -5257,6 +5301,8 @@ initialize_fixed_height_mode (PsppSheetView *tree_view)
       tree_view->priv->fixed_height = validate_row (tree_view, node, &iter, path);
 
       gtk_tree_path_free (path);
+
+      g_object_notify (G_OBJECT (tree_view), "fixed-height");
     }
 }
 
@@ -8727,7 +8773,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)
        {
@@ -8761,8 +8806,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); */
@@ -10966,7 +11009,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;
@@ -10981,8 +11023,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);
@@ -12352,12 +12392,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)
     {
@@ -12367,6 +12405,31 @@ pspp_sheet_view_set_special_cells (PsppSheetView           *tree_view,
     }
 }
 
+int
+pspp_sheet_view_get_fixed_height (const PsppSheetView *tree_view)
+{
+  /* XXX (re)calculate fixed_height if necessary */
+  return tree_view->priv->fixed_height;
+}
+
+void
+pspp_sheet_view_set_fixed_height (PsppSheetView *tree_view,
+                                  int fixed_height)
+{
+  g_return_if_fail (fixed_height > 0);
+
+  if (tree_view->priv->fixed_height != fixed_height)
+    {
+      tree_view->priv->fixed_height = fixed_height;
+      g_object_notify (G_OBJECT (tree_view), "fixed-height");
+    }
+  if (!tree_view->priv->fixed_height_set)
+    {
+      tree_view->priv->fixed_height_set = TRUE;
+      g_object_notify (G_OBJECT (tree_view), "fixed-height-set");
+    }
+}
+
 /**
  * pspp_sheet_view_set_tooltip_row:
  * @tree_view: a #PsppSheetView