Remove deprecated objects GtkAction and GtkUIManager

[pspp] / src / ui / gui / psppire-dialog-action-logistic.c

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index 0c4dc19cdc27895565b6376c2a30071abf6d5a04..dcff91278a4507e37a2968092055ca7a1d282356 100644 (file)
--- 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
@@ -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,12 +196,13 @@ 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)
     {