X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-scatterplot.c;h=041c857b73a03e40fa5c1938588bf99cda23a6b9;hb=32ea29485bdd610b7d05dd806c5f06f68da0f0fe;hp=34bd13fbf0d2d31fe753d294092d5e9f76671e9c;hpb=0bda70f475aad77db5636ae0bca170513353c988;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-scatterplot.c b/src/ui/gui/psppire-dialog-action-scatterplot.c
index 34bd13fbf0..041c857b73 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");
 
@@ -75,7 +75,7 @@ dialog_state_valid (gpointer data)
   if ( 0 == strcmp ("", yvar))
     return FALSE;
 
-  
+
   return TRUE;
 }
 
@@ -90,20 +90,13 @@ refresh (PsppireDialogAction *rd_)
 
 
 
-static void
-psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a)
+static GtkBuilder *
+psppire_dialog_action_scatterplot_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionScatterplot *act = PSPPIRE_DIALOG_ACTION_SCATTERPLOT (a);
 
-  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
-  GtkBuilder *xml = g_hash_table_lookup (thing, a);
-  if (!xml)
-    {
-      xml = builder_new ("scatterplot.ui");
-      g_hash_table_insert (thing, a, xml);
-    }
-
+  GtkBuilder *xml = builder_new ( "scatterplot.ui");
   pda->dialog = get_widget_assert   (xml, "scatterplot-dialog");
   pda->source = get_widget_assert   (xml, "scatterplot-treeview1");
 
@@ -112,15 +105,13 @@ psppire_dialog_action_scatterplot_activate (PsppireDialogAction *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);
+  return xml;
 }
 
 static void
 psppire_dialog_action_scatterplot_class_init (PsppireDialogActionScatterplotClass *class)
 {
-  psppire_dialog_action_set_activation (class, psppire_dialog_action_scatterplot_activate);
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_scatterplot_activate;
 
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }