projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireDataSheet.c: Indicate filtered out cases in the row headers
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-indep-samps.c
diff --git
a/src/ui/gui/psppire-dialog-action-indep-samps.c
b/src/ui/gui/psppire-dialog-action-indep-samps.c
index a1fed40abff9148844c7e4c6e8e9ee733b6d9d79..7a2511ad6ea7f91780c4245a8bf9c945e48049c8 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-indep-samps.c
+++ b/
src/ui/gui/psppire-dialog-action-indep-samps.c
@@
-96,7
+96,7
@@
value_entry_contains_invalid (PsppireValueEntry *ve, const struct variable *var)
{
gboolean result = FALSE;
{
gboolean result = FALSE;
- if (var)
+ if (var)
{
union value val;
const int width = var_get_width (var);
{
union value val;
const int width = var_get_width (var);
@@
-157,9
+157,9
@@
run_define_groups (PsppireDialogActionIndepSamps *act)
PsppireDialogAction *da = PSPPIRE_DIALOG_ACTION (act);
GtkWidget *parent1 = gtk_widget_get_parent (act->dg_table1);
GtkWidget *parent2 = gtk_widget_get_parent (act->dg_table2);
PsppireDialogAction *da = PSPPIRE_DIALOG_ACTION (act);
GtkWidget *parent1 = gtk_widget_get_parent (act->dg_table1);
GtkWidget *parent2 = gtk_widget_get_parent (act->dg_table2);
-
+
g_return_if_fail (act->grp_var);
g_return_if_fail (act->grp_var);
-
+
if (parent1)
gtk_container_remove (GTK_CONTAINER (parent1), act->dg_table1);
if (parent1)
gtk_container_remove (GTK_CONTAINER (parent1), act->dg_table1);
@@
-293,21
+293,15
@@
set_group_criterion_type (GtkToggleButton *button,
}
}
-static
void
-psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("indep-samples.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "indep-samples.ui");
- pda->dialog = get_widget_assert (xml,"independent-samples-dialog");
+ pda->dialog = get_widget_assert (xml,"independent-samples-dialog");
pda->source = get_widget_assert (xml, "indep-samples-treeview1");
act->define_groups_button = get_widget_assert (xml, "define-groups-button");
act->options_button = get_widget_assert (xml, "indep-samples-options-button");
pda->source = get_widget_assert (xml, "indep-samples-treeview1");
act->define_groups_button = get_widget_assert (xml, "define-groups-button");
act->options_button = get_widget_assert (xml, "indep-samples-options-button");
@@
-354,8
+348,7
@@
psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a)
on_grp_var_change (GTK_ENTRY (act->group_var_entry), act);
on_grp_var_change (GTK_ENTRY (act->group_var_entry), act);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_indep_samps_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_indep_samps_parent_class)->activate (pda);
+ return xml;
}
}
@@
-379,16
+372,16
@@
generate_syntax (const PsppireDialogAction *a)
g_string_append (str, "(");
{
g_string_append (str, "(");
{
- const union value *val =
+ const union value *val =
(act->group_defn == GROUPS_VALUES) ?
&act->grp_val[0] :
&act->cut_point;
(act->group_defn == GROUPS_VALUES) ?
&act->grp_val[0] :
&act->cut_point;
- struct string strx;
+ struct string strx;
ds_init_empty (&strx);
syntax_gen_value (&strx, val, var_get_width (act->grp_var),
var_get_print_format (act->grp_var));
ds_init_empty (&strx);
syntax_gen_value (&strx, val, var_get_width (act->grp_var),
var_get_print_format (act->grp_var));
-
+
g_string_append (str, ds_cstr (&strx));
ds_destroy (&strx);
}
g_string_append (str, ds_cstr (&strx));
ds_destroy (&strx);
}
@@
-400,10
+393,10
@@
generate_syntax (const PsppireDialogAction *a)
{
struct string strx;
ds_init_empty (&strx);
{
struct string strx;
ds_init_empty (&strx);
-
+
syntax_gen_value (&strx, &act->grp_val[1], var_get_width (act->grp_var),
var_get_print_format (act->grp_var));
syntax_gen_value (&strx, &act->grp_val[1], var_get_width (act->grp_var),
var_get_print_format (act->grp_var));
-
+
g_string_append (str, ds_cstr (&strx));
ds_destroy (&strx);
}
g_string_append (str, ds_cstr (&strx));
ds_destroy (&strx);
}
@@
-426,7
+419,7
@@
generate_syntax (const PsppireDialogAction *a)
static void
psppire_dialog_action_indep_samps_class_init (PsppireDialogActionIndepSampsClass *class)
{
static void
psppire_dialog_action_indep_samps_class_init (PsppireDialogActionIndepSampsClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_indep_samps_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_indep_samps_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}