PsppireDialogAction (generate_syntax): Change signature.

[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 3b89d443a37013327cbeeda0afe54893d2dcb900..503af138f5392230f40c5a2df30356c902d03f31 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,12 +91,12 @@ 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);
 
-  GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
   GtkBuilder *xml = g_hash_table_lookup (thing, a);
   if (!xml)
     {
@@ -120,9 +120,8 @@ psppire_dialog_action_scatterplot_activate (GtkAction *a)
 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;
 }