X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-logistic.c;h=e4887352ca9a19e20a73e899e9d34cdba832029e;hb=c779c0c9beb2e6b3bde870fdd2fd9cd8a86877fa;hp=0c4dc19cdc27895565b6376c2a30071abf6d5a04;hpb=c2d972816fce591524db963390a97ff32d55117c;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index 0c4dc19cdc..e4887352ca 100644
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012, 2016  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
@@ -79,14 +79,14 @@ on_opts_clicked (PsppireDialogActionLogistic *act)
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->cut_point_entry), act->cut_point);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (act->iterations_entry), act->max_iterations);
 
-  
+
   ret = psppire_dialog_run (PSPPIRE_DIALOG (act->opts_dialog));
 
   if ( ret == PSPPIRE_RESPONSE_CONTINUE )
     {
       act->conf = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->conf_checkbox));
       act->conf_level = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->conf_entry));
-      
+
       act->constant = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(act->const_checkbox));
 
       act->cut_point = gtk_spin_button_get_value (GTK_SPIN_BUTTON (act->cut_point_entry));
@@ -134,7 +134,7 @@ psppire_dialog_action_logistic_activate (PsppireDialogAction *a)
 			    G_CALLBACK (on_opts_clicked),  act);
 
   g_signal_connect (act->conf_checkbox, "toggled",
-		    G_CALLBACK (set_sensitivity_from_toggle),  
+		    G_CALLBACK (set_sensitivity_from_toggle),
 		    act->conf_entry);
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
@@ -145,14 +145,12 @@ psppire_dialog_action_logistic_activate (PsppireDialogAction *a)
   psppire_dialog_action_set_valid_predicate (pda,
 					dialog_state_valid);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_logistic_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_logistic_parent_class)->activate (pda);
 }
 
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   gchar *text = NULL;
@@ -198,19 +196,20 @@ generate_syntax (PsppireDialogAction *a)
   g_string_append (strx, categoricals->str);
   g_string_free (categoricals, TRUE);
   g_slist_free (vars);
-  
-  g_string_append (strx, "\n\t/CRITERIA =");
-
-  g_string_append_printf (strx, " CUT(%g)", rd->cut_point);
 
-  g_string_append_printf (strx, " ITERATE(%d)", rd->max_iterations);
+  struct string opt_str;
+  ds_init_cstr (&opt_str, "\n\t/CRITERIA =");
+  syntax_gen_pspp (&opt_str, " CUT(%g)", rd->cut_point);
+  syntax_gen_pspp (&opt_str, " ITERATE(%d)", rd->max_iterations);
+  g_string_append (strx, ds_cstr (&opt_str));
+  ds_destroy (&opt_str);
 
   if (rd->conf)
     {
       g_string_append_printf (strx, "\n\t/PRINT = CI(%g)", rd->conf_level);
     }
 
-  if (rd->constant) 
+  if (rd->constant)
     g_string_append (strx, "\n\t/NOORIGIN");
   else
     g_string_append (strx, "\n\t/ORIGIN");