X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=83a82d44fdd772cdf40ab3112288b8a6ae247263;hb=2bbf5d66eeeffdbcded913145f05b9a6046056fa;hp=f5be69d8705981d52300008499046662675ebafc;hpb=ffe5ba65c269e9207308608139ea2cbb4fcb761f;p=pspp
diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index f5be69d870..83a82d44fd 100644
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -1,5 +1,5 @@
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2013 Free Software Foundation
+ Copyright (C) 2013, 2014 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-/* This file implements a GtkTreeModel. It allows GtkComboBox and
+/* This file implements a GtkTreeModel. It allows GtkComboBox and
GtkTreeView to display the names and non-empty cell ranges of the
sheets aka "Tables" of spreadsheet files.
It doesn't take any notice of the spreadsheet data itself.
@@ -23,6 +23,8 @@
#include
#include
+#include
+
#include
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
@@ -97,13 +99,14 @@ psppire_spreadsheet_model_set_property (GObject * object,
const GValue * value,
GParamSpec * pspec)
{
- PsppireSpreadsheetModel *spreadsheetModel =
+ PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (object);
switch (prop_id)
{
case PROP_SPREADSHEET:
spreadsheetModel->spreadsheet = g_value_get_pointer (value);
+ spreadsheet_ref (spreadsheetModel->spreadsheet);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -115,6 +118,14 @@ psppire_spreadsheet_model_set_property (GObject * object,
static void
psppire_spreadsheet_model_dispose (GObject * object)
{
+ PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object);
+
+ if (!spreadsheetModel->dispose_has_run)
+ {
+ spreadsheet_unref (spreadsheetModel->spreadsheet);
+
+ spreadsheetModel->dispose_has_run = TRUE;
+ }
}
static void
@@ -210,7 +221,7 @@ tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
n = indices[0];
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer) (intptr_t) n;
return TRUE;
}
@@ -218,14 +229,11 @@ tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
static gboolean
tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
{
- PsppireSpreadsheetModel *spreadsheetModel =
- PSPPIRE_SPREADSHEET_MODEL (model);
+ PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model);
+ g_assert (iter);
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE);
- if (iter == NULL)
- return FALSE;
-
- if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
+ if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
{
iter->user_data = NULL;
iter->stamp = 0;
@@ -254,8 +262,8 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
{
const char *x =
spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
- (gint) iter->user_data);
-
+ (intptr_t) iter->user_data);
+
g_value_set_string (value, x);
}
break;
@@ -263,7 +271,7 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
{
char *x =
spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet,
- (gint) iter->user_data);
+ (intptr_t) iter->user_data);
g_value_set_string (value, x ? x : _("(empty)"));
g_free (x);
@@ -290,7 +298,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
return FALSE;
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer) (intptr_t) n;
return TRUE;
}
@@ -319,7 +327,7 @@ tree_model_get_path (GtkTreeModel * model, GtkTreeIter * iter)
PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
GtkTreePath *path;
- gint index = (gint) iter->user_data;
+ gint index = (intptr_t) iter->user_data;
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, NULL);
@@ -341,7 +349,7 @@ tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent
iter->stamp = spreadsheetModel->stamp;
iter->user_data = 0;
-
+
return TRUE;
}