projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compute Dialog: Convert to PsppireDialogAction
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-descriptives.c
diff --git
a/src/ui/gui/psppire-dialog-action-descriptives.c
b/src/ui/gui/psppire-dialog-action-descriptives.c
index 170604c9458b8a9f26655d79be16cc3ea4aa7890..1b5b7a5781618738fece2f1f3beb9f7a8ba5b562 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-descriptives.c
+++ b/
src/ui/gui/psppire-dialog-action-descriptives.c
@@
-19,7
+19,7
@@
#include "psppire-dialog-action-descriptives.h"
#include "psppire-dialog-action-descriptives.h"
-#include "checkbox-treeview.h"
+#include "
psppire-
checkbox-treeview.h"
#include "psppire-var-view.h"
#include "psppire-dict.h"
#include "psppire-var-view.h"
#include "psppire-dict.h"
@@
-169,8
+169,10
@@
dialog_state_valid (gpointer data)
}
static void
}
static void
-dialog_refresh (PsppireDialogAction
Descriptives *scd
)
+dialog_refresh (PsppireDialogAction
*scd_
)
{
{
+ PsppireDialogActionDescriptives *scd
+ = PSPPIRE_DIALOG_ACTION_DESCRIPTIVES (scd_);
GtkTreeModel *liststore;
GtkTreeIter iter;
size_t i;
GtkTreeModel *liststore;
GtkTreeIter iter;
size_t i;
@@
-204,12
+206,12
@@
psppire_dialog_action_descriptives_activate (GtkAction *a)
pda->source = get_widget_assert (xml, "all-variables");
act->variables = get_widget_assert (xml, "stat-variables");
pda->source = get_widget_assert (xml, "all-variables");
act->variables = get_widget_assert (xml, "stat-variables");
- g_object_set (pda->source,
"model", pda->dict,
+ g_object_set (pda->source,
"predicate", var_is_numeric, NULL);
"predicate", var_is_numeric, NULL);
- p
ut_checkbox_items_in_treeview (GTK_TREE_
VIEW (stats_treeview),
- B_DS_DEFAULT,
- N_DESCRIPTIVE_STATS, stats);
+ p
sppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREE
VIEW (stats_treeview),
+
B_DS_DEFAULT,
+
N_DESCRIPTIVE_STATS, stats);
act->stat_vars = GTK_TREE_VIEW (act->variables);
act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
act->stat_vars = GTK_TREE_VIEW (act->variables);
act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
@@
-225,6
+227,8
@@
psppire_dialog_action_descriptives_activate (GtkAction *a)
psppire_dialog_action_set_refresh (pda, dialog_refresh);
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_descriptives_parent_class)->activate (pda);
+
+ g_object_unref (xml);
}
static void
}
static void