X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-two-sample.c;h=2ad9b5ce134d17be80c19e84c2e9dfdb1da7b049;hb=0f447caa885d8f0fd8c30d4440556d9b6abb99ea;hp=8cc0c00121101fff73e1aa103ec0301f29e9cc12;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-two-sample.c b/src/ui/gui/psppire-dialog-action-two-sample.c
index 8cc0c00121..2ad9b5ce13 100644
--- a/src/ui/gui/psppire-dialog-action-two-sample.c
+++ b/src/ui/gui/psppire-dialog-action-two-sample.c
@@ -68,7 +68,7 @@ dialog_state_valid (gpointer data)
 
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (pd->nts[NT_MCNEMAR].button)))
     return TRUE;
-    
+
   return FALSE;
 }
 
@@ -134,7 +134,7 @@ select_as_pair_member (GtkTreeIter source_iter,
 
 
 static gchar *
-generate_syntax (PsppireDialogAction *pda)
+generate_syntax (const PsppireDialogAction *pda)
 {
   gint i;
 
@@ -168,55 +168,49 @@ generate_syntax (PsppireDialogAction *pda)
   return text;
 }
 
-static void
-psppire_dialog_action_two_sample_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_two_sample_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionTwoSample *act = PSPPIRE_DIALOG_ACTION_TWO_SAMPLE (a);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("paired-samples.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
+  GtkBuilder *xml = builder_new ( "paired-samples.ui");
 
-  GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
+  /* NPAR Specific options */
+  GtkWidget *frame = gtk_frame_new (_("Test Type"));
+  GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+  GtkWidget *box = get_widget_assert (xml, "dynamic-populate");
 
-  pda->dialog = get_widget_assert   (xml, "t-test-paired-samples-dialog");
-  pda->source = get_widget_assert   (xml, "paired-samples-t-test-treeview1");
 
-  gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Two-Related-Samples Tests"));
+  strcpy (act->nts[NT_WILCOXON].syntax, "/WILCOXON");
+  strcpy (act->nts[NT_SIGN].syntax, "/SIGN");
+  strcpy (act->nts[NT_MCNEMAR].syntax, "/MCNEMAR");
 
-  act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2");
-  act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview)));
+  act->nts[NT_WILCOXON].button = gtk_check_button_new_with_mnemonic (_("_Wilcoxon"));
+  act->nts[NT_SIGN].button = gtk_check_button_new_with_mnemonic (_("_Sign"));
+  act->nts[NT_MCNEMAR].button = gtk_check_button_new_with_mnemonic (_("_McNemar"));
 
-  {
-    /* NPAR Specific options */
-    GtkWidget *frame = gtk_frame_new (_("Test Type"));
-    GtkWidget *bb = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
-    GtkWidget *box = get_widget_assert (xml, "vbox3");
+  gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_WILCOXON].button, FALSE, FALSE, 5);
+  gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_SIGN].button,     FALSE, FALSE, 5);
+  gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_MCNEMAR].button,  FALSE, FALSE, 5);
 
+  gtk_container_add (GTK_CONTAINER (frame), bb);
 
-    strcpy (act->nts[NT_WILCOXON].syntax, "/WILCOXON");
-    strcpy (act->nts[NT_SIGN].syntax, "/SIGN");
-    strcpy (act->nts[NT_MCNEMAR].syntax, "/MCNEMAR");
+  gtk_widget_show_all (frame);
 
-    act->nts[NT_WILCOXON].button = gtk_check_button_new_with_mnemonic (_("_Wilcoxon"));
-    act->nts[NT_SIGN].button = gtk_check_button_new_with_mnemonic (_("_Sign"));
-    act->nts[NT_MCNEMAR].button = gtk_check_button_new_with_mnemonic (_("_McNemar"));
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE,  5);
 
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_WILCOXON].button, FALSE, FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_SIGN].button,     FALSE, FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (bb), act->nts[NT_MCNEMAR].button,  FALSE, FALSE, 5);
 
-    gtk_container_add (GTK_CONTAINER (frame), bb);
+  GtkWidget *selector = get_widget_assert (xml, "psppire-selector3");
 
-    gtk_widget_show_all (frame);
+  pda->dialog = get_widget_assert   (xml, "t-test-paired-samples-dialog");
+  pda->source = get_widget_assert   (xml, "paired-samples-t-test-treeview1");
+
+  gtk_window_set_title (GTK_WINDOW (pda->dialog), _("Two-Related-Samples Tests"));
+
+  act->pairs_treeview = get_widget_assert (xml, "paired-samples-t-test-treeview2");
+  act->list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (act->pairs_treeview)));
 
-    gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE,  5);
-  }
 
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
@@ -228,15 +222,13 @@ psppire_dialog_action_two_sample_activate (GtkAction *a)
   psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector),
 				    select_as_pair_member,
 				    act);
-  
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_two_sample_parent_class)->activate (pda);
+  return xml;
 }
 
 static void
 psppire_dialog_action_two_sample_class_init (PsppireDialogActionTwoSampleClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_two_sample_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_two_sample_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }