numbers back in tables

[pspp] / src / ui / gui / t-test-options.c

diff --git a/src/ui/gui/t-test-options.c b/src/ui/gui/t-test-options.c
index 1e44c0eb05829dcaf698d63adc034ef3717f23e1..17d2d525087125ad163bfa70cf080cf64a9454df 100644 (file)
--- a/src/ui/gui/t-test-options.c
+++ b/src/ui/gui/t-test-options.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2012  Free Software Foundation
+   Copyright (C) 2007, 2012, 2015  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -63,10 +63,10 @@ tt_options_dialog_create (GtkWindow *parent)
 
   tto->confidence =
     psppire_scanf_new (_("Con_fidence Interval: %2d %%"), &tto->conf_percent);
-  
-  g_object_set (tto->confidence, 
-               "use-underline", TRUE, 
-               "mnemonic-widget", psppire_scanf_get_child (tto->confidence, 0),
+
+  g_object_set (tto->confidence,
+               "use-underline", TRUE,
+               "mnemonic-widget", psppire_scanf_get_child (PSPPIRE_SCANF (tto->confidence), 0),
                NULL);
 
   tto->dialog = get_widget_assert (tto->xml, "options-dialog");
@@ -92,6 +92,8 @@ tt_options_dialog_create (GtkWindow *parent)
 void
 tt_options_dialog_destroy (struct tt_options_dialog *tto)
 {
+  if (tto == NULL)
+    return;
   gtk_container_remove (GTK_CONTAINER (tto->box), tto->confidence);
   g_object_unref (tto->xml);
   g_free (tto);
@@ -103,7 +105,7 @@ tt_options_dialog_run (struct tt_options_dialog *tto)
 {
   gint response;
 
-  if ( tto->excl == EXCL_ANALYSIS)
+  if (tto->excl == EXCL_ANALYSIS)
     gtk_toggle_button_set_active (tto->analysis, TRUE);
   else
     gtk_toggle_button_set_active (tto->listwise, TRUE);
@@ -112,12 +114,12 @@ tt_options_dialog_run (struct tt_options_dialog *tto)
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (tto->dialog));
 
-  if ( response == PSPPIRE_RESPONSE_CONTINUE)
+  if (response == PSPPIRE_RESPONSE_CONTINUE)
     {
       tto->non_default_options = TRUE;
 
       tto->confidence_interval = gtk_spin_button_get_value (tto->conf_percent);
-      if ( gtk_toggle_button_get_active (tto->analysis) )
+      if (gtk_toggle_button_get_active (tto->analysis))
        tto->excl = EXCL_ANALYSIS;
       else
        tto->excl = EXCL_LISTWISE;
@@ -127,14 +129,20 @@ tt_options_dialog_run (struct tt_options_dialog *tto)
 void
 tt_options_dialog_append_syntax (const struct tt_options_dialog *tto, GString *str)
 {
-  g_string_append (str, "\t/MISSING=");
+  struct string dss;
+  ds_init_empty (&dss);
+
+  ds_put_cstr (&dss, "\t/MISSING=");
 
-  if ( tto->excl == EXCL_ANALYSIS )
-    g_string_append (str, "ANALYSIS");
+  if (tto->excl == EXCL_ANALYSIS)
+    ds_put_cstr (&dss, "ANALYSIS");
   else
-    g_string_append (str, "LISTWISE");
+    ds_put_cstr (&dss, "LISTWISE");
+
+  ds_put_c_format (&dss, "\n\t/CRITERIA=CI(%g)",
+                  tto->confidence_interval/100.0);
 
+  g_string_append (str, ds_cstr (&dss));
 
-  g_string_append_printf (str, "\n\t/CRITERIA=CIN(%g)",
-                         tto->confidence_interval/100.0);
+  ds_destroy (&dss);
 }