Remove redundant "break"

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

diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c
index e59353c973a2f675f64e48163f02960c4d397af8..fa5d6233f771ba381b8f5b37bdce81684db42835 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-scatterplot.c
+++ b/src/ui/gui/psppire-dialog-action-scatterplot.c
@@ -38,7 +38,7 @@ G_DEFINE_TYPE (PsppireDialogActionScatterplot, psppire_dialog_action_scatterplot
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionScatterplot *ow = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (act);
   gchar *text;
@@ -46,11 +46,11 @@ generate_syntax (PsppireDialogAction *act)
 
   ds_init_cstr (&dss, "GRAPH SCATTERPLOT(BIVARIATE) = ");
 
-  ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->y_axis)));
+  ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->x_axis)));
   
   ds_put_cstr (&dss, " WITH ");
 
-  ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->x_axis)));
+  ds_put_cstr (&dss, gtk_entry_get_text (GTK_ENTRY (ow->y_axis)));
 
   ds_put_cstr (&dss, ".\n");
 
@@ -91,7 +91,7 @@ refresh (PsppireDialogAction *rd_)
 
 
 static void
-psppire_dialog_action_scatterplot_activate (GtkAction *a)
+psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a);
@@ -113,8 +113,6 @@ psppire_dialog_action_scatterplot_activate (GtkAction *a)
   psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, refresh);
 
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_scatterplot_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_scatterplot_parent_class)->activate (pda);
 }
 
 static void