X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-scatterplot.c;h=fa5d6233f771ba381b8f5b37bdce81684db42835;hb=31f8fb281926b5b05feb67596627f0366c58d52e;hp=f3b37078610f0e465e40b5ca7d7a83eba4515c75;hpb=ed208cf009043f0bf319a4e919c279d5b1401f36;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c
index f3b3707861..fa5d6233f7 100644
--- 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,16 +113,13 @@ 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
 psppire_dialog_action_scatterplot_class_init (PsppireDialogActionScatterplotClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_scatterplot_activate);
 
-  action_class->activate = psppire_dialog_action_scatterplot_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }