if ( var_is_numeric (act->grp_var))
{
- gtk_table_attach_defaults (GTK_TABLE (act->dg_table1), act->dg_table2,
- 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (act->dg_table1), act->dg_table2,
+ 1, 1, 1, 1);
gtk_container_add (GTK_CONTAINER (act->dg_box), act->dg_table1);
}
static void
-psppire_dialog_action_indep_samps_activate (GtkAction *a)
+psppire_dialog_action_indep_samps_activate (PsppireDialogAction *a)
{
PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GtkBuilder *xml = builder_new ("indep-samples.ui");
+ 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);
+ }
pda->dialog = get_widget_assert (xml,"independent-samples-dialog");
pda->source = get_widget_assert (xml, "indep-samples-treeview1");
g_signal_connect (act->dg_values_toggle_button, "toggled",
G_CALLBACK (set_group_criterion_type), act);
-
- g_object_unref (xml);
-
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
static void
psppire_dialog_action_indep_samps_class_init (PsppireDialogActionIndepSampsClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_indep_samps_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_indep_samps_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}