X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=d946197262fe4ac7c01db4db4473e2ca68dec57f;hb=9fd7169a58954be733ae42de9916826dd56a8b81;hp=f5be69d8705981d52300008499046662675ebafc;hpb=1c7f6a1a90ea22ced2e21e5dec32a2bc23ccfbf0;p=pspp
diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index f5be69d870..d946197262 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
@@ -31,57 +33,18 @@
#include "psppire-spreadsheet-model.h"
#include "data/spreadsheet-reader.h"
-
-static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
- spreadsheetModel);
-static void psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass
- * class);
-
static void psppire_spreadsheet_model_finalize (GObject * object);
static void psppire_spreadsheet_model_dispose (GObject * object);
static GObjectClass *parent_class = NULL;
-
static void spreadsheet_tree_model_init (GtkTreeModelIface * iface);
-
-GType
-psppire_spreadsheet_model_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo spreadsheet_model_info = {
- sizeof (PsppireSpreadsheetModelClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) psppire_spreadsheet_model_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (PsppireSpreadsheetModel),
- 0,
- (GInstanceInitFunc) psppire_spreadsheet_model_init,
- };
-
- static const GInterfaceInfo tree_model_info = {
- (GInterfaceInitFunc) spreadsheet_tree_model_init,
- NULL,
- NULL
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT,
- "PsppireSpreadsheetModel",
- &spreadsheet_model_info, 0);
-
- g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL,
- &tree_model_info);
- }
-
- return object_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireSpreadsheetModel,\
+ psppire_spreadsheet_model,\
+ G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+ spreadsheet_tree_model_init))
/* Properties */
enum
@@ -97,13 +60,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 +79,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
@@ -126,7 +98,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",
@@ -135,7 +107,7 @@ psppire_spreadsheet_model_class_init (PsppireSpreadsheetModelClass * class)
| G_PARAM_WRITABLE);
parent_class = g_type_class_peek_parent (class);
- object_class = (GObjectClass *) class;
+
object_class->set_property = psppire_spreadsheet_model_set_property;
@@ -210,7 +182,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,21 +190,18 @@ 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;
return FALSE;
}
- iter->user_data++;
+ iter->user_data = GINT_TO_POINTER (GPOINTER_TO_INT (iter->user_data) + 1);
return TRUE;
}
@@ -254,8 +223,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 +232,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 +259,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 +288,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 +310,7 @@ tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent
iter->stamp = spreadsheetModel->stamp;
iter->user_data = 0;
-
+
return TRUE;
}