/* 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
#include <config.h>
#include <glib.h>
+#include <stdint.h>
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
{
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);
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
n = indices[0];
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer) (intptr_t) n;
return TRUE;
}
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;
{
const char *x =
spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
- (gint) iter->user_data);
+ (intptr_t) iter->user_data);
g_value_set_string (value, x);
}
{
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);
return FALSE;
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer) (intptr_t) n;
return TRUE;
}
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);