X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=26c803f3a670a90d3923db358422e3a78c209634;hb=ff5de86ff88b3d3c8552ac0e29c94f4ce3a4f2eb;hp=0bf362ae7bd23c565b5964d84190b3b4a381ce6b;hpb=dcd593ebc418681f2a7f14795b13f94eaa95ccaf;p=pspp

diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 0bf362ae7b..26c803f3a6 100644
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -66,8 +66,12 @@ psppire_spreadsheet_model_set_property (GObject * object,
   switch (prop_id)
     {
     case PROP_SPREADSHEET:
-      spreadsheetModel->spreadsheet = g_value_get_pointer (value);
-      spreadsheet_ref (spreadsheetModel->spreadsheet);
+      {
+	struct spreadsheet *old = spreadsheetModel->spreadsheet;
+	spreadsheetModel->spreadsheet = spreadsheet_ref (g_value_get_pointer (value));
+	if (old)
+	  spreadsheet_unref (old);
+      }
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -98,7 +102,7 @@ psppire_spreadsheet_model_finalize (GObject * object)
 static void
 psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class)
 {
-  GObjectClass *object_class;
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
 
   GParamSpec *spreadsheet_spec = g_param_spec_pointer ("spreadsheet",
                                                        "Spreadsheet",
@@ -108,7 +112,6 @@ psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class)
 
   parent_class = g_type_class_peek_parent (class);
 
-  object_class = (GObjectClass *) class;
 
   object_class->set_property = psppire_spreadsheet_model_set_property;
 
@@ -159,6 +162,9 @@ 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 < PSPPIRE_SPREADSHEET_MODEL_N_COLS, (GType) 0);
 
+  if (index ==  PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_ROWS)
+    return G_TYPE_UINT;
+
   return G_TYPE_STRING;
 }
 
@@ -195,14 +201,15 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
   g_assert (iter);
   g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE);
 
-  if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
+  if ((intptr_t) iter->user_data >=
+      spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet) - 1)
     {
       iter->user_data = NULL;
       iter->stamp = 0;
       return FALSE;
     }
 
-  iter->user_data++;
+  iter->user_data = GINT_TO_POINTER (GPOINTER_TO_INT (iter->user_data) + 1);
 
   return TRUE;
 }
@@ -217,11 +224,11 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
   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 PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
       {
+        g_value_init (value, G_TYPE_STRING);
         const char *x =
           spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
                                       (intptr_t) iter->user_data);
@@ -231,6 +238,7 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
       break;
     case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
       {
+        g_value_init (value, G_TYPE_STRING);
         char *x =
           spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet,
                                        (intptr_t) iter->user_data);
@@ -239,6 +247,26 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
 	g_free (x);
       }
       break;
+    case PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_ROWS:
+      {
+        g_value_init (value, G_TYPE_UINT);
+        unsigned int rows =
+          spreadsheet_get_sheet_n_rows (spreadsheetModel->spreadsheet,
+                                        (intptr_t) iter->user_data);
+
+        g_value_set_uint (value, rows);
+      }
+      break;
+    case PSPPIRE_SPREADSHEET_MODEL_COL_SHEET_COLUMNS:
+      {
+        g_value_init (value, G_TYPE_UINT);
+        unsigned int columns =
+          spreadsheet_get_sheet_n_columns (spreadsheetModel->spreadsheet,
+                                           (intptr_t) iter->user_data);
+
+        g_value_set_uint (value, columns);
+      }
+      break;
     default:
       g_error ("%s:%d Invalid column in spreadsheet model",
 	       __FILE__, __LINE__);
@@ -256,7 +284,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
   if (parent)
     return FALSE;
 
-  if (n >= spreadsheetModel->spreadsheet->n_sheets)
+  if (n >= spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet))
     return FALSE;
 
   iter->stamp = spreadsheetModel->stamp;
@@ -272,7 +300,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
     PSPPIRE_SPREADSHEET_MODEL (model);
 
   if (iter == NULL)
-    return spreadsheetModel->spreadsheet->n_sheets;
+    return spreadsheet_get_sheet_n_sheets (spreadsheetModel->spreadsheet);
 
   return 0;
 }