X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-indep-samps.c;h=df3805114938cbe4bebd6f169ce88d13bfedb717;hb=refs%2Fbuilds%2F20131219033048%2Fpspp;hp=3747d3e83d9c5e0dda630523eef90f399184619a;hpb=3255c12b6a9c2f4217d6df0649556d8e45c954ed;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-indep-samps.c b/src/ui/gui/psppire-dialog-action-indep-samps.c index 3747d3e83d..df38051149 100644 --- a/src/ui/gui/psppire-dialog-action-indep-samps.c +++ b/src/ui/gui/psppire-dialog-action-indep-samps.c @@ -151,13 +151,14 @@ run_define_groups (PsppireDialogActionIndepSamps *act) { gint response; PsppireDialogAction *da = PSPPIRE_DIALOG_ACTION (act); + GtkWidget *parent1 = gtk_widget_get_parent (act->dg_table1); + GtkWidget *parent2 = gtk_widget_get_parent (act->dg_table2); - if ( act->dg_table2->parent) - gtk_container_remove (GTK_CONTAINER (act->dg_table2->parent), act->dg_table2); - - if ( act->dg_table1->parent) - gtk_container_remove (GTK_CONTAINER (act->dg_table1->parent), act->dg_table1); + if (parent1) + gtk_container_remove (GTK_CONTAINER (parent1), act->dg_table1); + if (parent2) + gtk_container_remove (GTK_CONTAINER (parent2), act->dg_table2); if ( var_is_numeric (act->grp_var)) { @@ -291,16 +292,16 @@ psppire_dialog_action_indep_samps_activate (GtkAction *a) PsppireDialogActionIndepSamps *act = PSPPIRE_DIALOG_ACTION_INDEP_SAMPS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ("t-test.ui"); + GtkBuilder *xml = builder_new ("indep-samples.ui"); - pda->dialog = get_widget_assert (xml,"t-test-independent-samples-dialog"); - pda->source = get_widget_assert (xml, "indep-samples-t-test-treeview1"); + 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-t-test-options-button"); + act->options_button = get_widget_assert (xml, "indep-samples-options-button"); act->def_grps_dialog = get_widget_assert (xml, "define-groups-dialog"); - act->group_var_entry = get_widget_assert (xml, "indep-samples-t-test-entry"); - act->test_vars_tv = get_widget_assert (xml, "indep-samples-t-test-treeview2"); + act->group_var_entry = get_widget_assert (xml, "indep-samples-entry"); + act->test_vars_tv = get_widget_assert (xml, "indep-samples-treeview2"); act->dg_dialog = get_widget_assert (xml, "define-groups-dialog"); act->dg_grp_entry[0] = get_widget_assert (xml, "group1-entry");