Added a callback to set the range entry on change

[pspp] / src / ui / gui / psppire-spreadsheet-model.c

diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 4742cee9c08cc81d1f728c9861836bb1bb5cf5b7..240356f294cb87f3b6239e752bcafed70314b2c5 100644 (file)
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -89,7 +89,7 @@ psppire_spreadsheet_model_set_property (GObject * object,
                                         const GValue * value,
                                         GParamSpec * pspec)
 {
-  PsppireSpreadsheetModel *spreadsheetModel =
+  PsppireSpreadsheetModel *spreadsheetModel = 
     PSPPIRE_SPREADSHEET_MODEL (object);
 
   switch (prop_id)
@@ -157,18 +157,10 @@ psppire_spreadsheet_model_new (struct spreadsheet *sp)
 
 \f
 
-
-enum
-{
-  COL_SHEET_NAME,
-  COL_SHEET_RANGE,
-  N_COLS
-};
-
 static gint
 tree_model_n_columns (GtkTreeModel * model)
 {
-  return N_COLS;
+  return PSPPIRE_SPREADSHEET_MODEL_N_COLS;
 }
 
 static GtkTreeModelFlags
@@ -184,7 +176,7 @@ static GType
 tree_model_column_type (GtkTreeModel * model, gint index)
 {
   g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), (GType) 0);
-  g_return_val_if_fail (index < N_COLS, (GType) 0);
+  g_return_val_if_fail (index < PSPPIRE_SPREADSHEET_MODEL_N_COLS, (GType) 0);
 
   return G_TYPE_STRING;
 }
@@ -216,7 +208,7 @@ tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
 }
 
 static gboolean
-tree_model_iter_next (GtkTreeModel * model, GtkTreeIter * iter)
+tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
 {
   PsppireSpreadsheetModel *spreadsheetModel =
     PSPPIRE_SPREADSHEET_MODEL (model);
@@ -244,13 +236,13 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
 {
   PsppireSpreadsheetModel *spreadsheetModel =
     PSPPIRE_SPREADSHEET_MODEL (model);
-  g_return_if_fail (column < N_COLS);
+  g_return_if_fail (column < PSPPIRE_SPREADSHEET_MODEL_N_COLS);
   g_return_if_fail (iter->stamp == spreadsheetModel->stamp);
 
   g_value_init (value, G_TYPE_STRING);
   switch (column)
     {
-    case COL_SHEET_NAME:
+    case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
       {
         const char *x =
           gnumeric_get_sheet_name (spreadsheetModel->spreadsheet,
@@ -258,17 +250,18 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
         g_value_set_string (value, x);
       }
       break;
-    case COL_SHEET_RANGE:
+    case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
       {
-        const char *x =
+        char *x =
           gnumeric_get_sheet_range (spreadsheetModel->spreadsheet,
                                     (gint) iter->user_data);
         g_value_set_string (value, x);
+       g_free (x);
       }
       break;
     default:
-      g_error ("%s:%d Invalid column in spreadsheet model", __FILE__,
-               __LINE__);
+      g_error ("%s:%d Invalid column in spreadsheet model",
+              __FILE__, __LINE__);
       break;
     }
 }
@@ -305,7 +298,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
 }
 
 static gboolean
-tree_model_iter_has_child (GtkTreeModel * tree_model, GtkTreeIter * iter)
+tree_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter)
 {
   return FALSE;
 }
@@ -328,6 +321,21 @@ tree_model_get_path (GtkTreeModel * model, GtkTreeIter * iter)
 }
 
 
+static gboolean
+tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent)
+{
+  PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model);
+
+  if (parent != NULL)
+    return FALSE;
+
+  iter->stamp = spreadsheetModel->stamp;
+  iter->user_data = 0;
+    
+  return TRUE;
+}
+
+
 
 static void
 spreadsheet_tree_model_init (GtkTreeModelIface * iface)
@@ -339,7 +347,7 @@ spreadsheet_tree_model_init (GtkTreeModelIface * iface)
   iface->iter_next = tree_model_iter_next;
   iface->get_value = tree_model_get_value;
 
-  iface->iter_children = NULL;
+  iface->iter_children = tree_model_children;
   iface->iter_parent = NULL;
 
   iface->get_path = tree_model_get_path;