projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RANK: Lowercase the name of "enum RANK_FUNC".
[pspp]
/
src
/
ui
/
gui
/
psppire-data-editor.c
diff --git
a/src/ui/gui/psppire-data-editor.c
b/src/ui/gui/psppire-data-editor.c
index 6f1c0afd5cbf2566918ebed8cc358dc2767c5bf8..02ef97a9077b1907958a867c611e419751c942b9 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2009, 2010, 2011
, 2012
Free Software Foundation, Inc.
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
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
@@
-89,7
+89,6
@@
psppire_data_editor_dispose (GObject *obj)
if (de->dispose_has_run)
return;
if (de->dispose_has_run)
return;
- g_object_unref (de->data_window);
g_object_unref (de->data_store);
g_object_unref (de->var_store);
g_object_unref (de->data_store);
g_object_unref (de->var_store);
@@
-337,17
+336,18
@@
insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
static void
static void
-delete_variable_callback (PsppireDict *dict, gint posn,
- gint x UNUSED, gint y UNUSED, gpointer data)
+delete_variable_callback (PsppireDict *dict,
+ const struct variable *var UNUSED,
+ gint dict_idx, gint case_idx UNUSED, gpointer data)
{
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
PsppireAxis *var_vaxis;
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
{
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
PsppireAxis *var_vaxis;
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
- psppire_axis_delete (var_vaxis,
posn
, 1);
+ psppire_axis_delete (var_vaxis,
dict_idx
, 1);
- psppire_axis_delete (de->haxis,
posn
, 1);
+ psppire_axis_delete (de->haxis,
dict_idx
, 1);
}
}
@@
-384,8
+384,9
@@
psppire_data_editor_set_property (GObject *object,
psppire_data_editor_split_window (de, g_value_get_boolean (value));
break;
case PROP_DATA_WINDOW:
psppire_data_editor_split_window (de, g_value_get_boolean (value));
break;
case PROP_DATA_WINDOW:
+ /* We hold no reference to this object, since it is used only by do_sort,
+ and that cannot be called unless the window is realized. */
de->data_window = g_value_get_pointer (value);
de->data_window = g_value_get_pointer (value);
- g_object_ref (de->data_window);
break;
case PROP_DATA_STORE:
if ( de->data_store) g_object_unref (de->data_store);
break;
case PROP_DATA_STORE:
if ( de->data_store) g_object_unref (de->data_store);