X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-means.c;h=7ff11177decf5bcd78a799f551f473afc603432c;hb=6c9aa9259c46de52cc57493ccc80f40f3eef9b17;hp=9b20560a05c100e036b24660ea2653bd04bc4b2e;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c
index 9b20560a05..7ff11177de 100644
--- a/src/ui/gui/psppire-dialog-action-means.c
+++ b/src/ui/gui/psppire-dialog-action-means.c
@@ -36,7 +36,7 @@ G_DEFINE_TYPE (PsppireDialogActionMeans, psppire_dialog_action_means, PSPPIRE_TY
 
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   gint l;
   PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act);
@@ -92,23 +92,29 @@ dialog_refresh (PsppireDialogAction *da)
 }
 
 static void
-psppire_dialog_action_means_activate (GtkAction *a)
+psppire_dialog_action_means_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (a);
 
-  GtkBuilder *xml = builder_new ("means.ui");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("means.ui");
+      g_hash_table_insert (thing, a, xml);
 
-  GtkWidget *vb =   get_widget_assert   (xml, "alignment3");
-  GtkWidget *selector = get_widget_assert   (xml, "layer-selector");
+      GtkWidget *vb =   get_widget_assert (xml, "frame2");
+      act->layer = psppire_means_layer_new ();
+      gtk_container_add (GTK_CONTAINER (vb), act->layer);
+      gtk_widget_show (act->layer);
+    }
   
-  act->layer = psppire_means_layer_new ();
-  gtk_container_add (GTK_CONTAINER (vb), act->layer);
-  gtk_widget_show (act->layer);
+  GtkWidget *selector = get_widget_assert (xml, "layer-selector");
 
-  pda->dialog = get_widget_assert   (xml, "means-dialog");
-  pda->source = get_widget_assert   (xml, "all-variables");
-  act->variables = get_widget_assert   (xml, "stat-variables");
+  pda->dialog = get_widget_assert (xml, "means-dialog");
+  pda->source = get_widget_assert (xml, "all-variables");
+  act->variables = get_widget_assert (xml, "stat-variables");
 
   g_object_set (pda->source,
 		"predicate", var_is_numeric,
@@ -118,13 +124,10 @@ psppire_dialog_action_means_activate (GtkAction *a)
 		"dest-widget", act->layer,
 		NULL);
 
-
   psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
   psppire_dialog_action_set_refresh (pda, dialog_refresh);
 
   PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda);
-
-  g_object_unref (xml);
 }
 
 static void