X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-sort.c;h=8377e9592fd27fd716abac36d496e31a2b8305ad;hb=c2d972816fce591524db963390a97ff32d55117c;hp=2a80a6e7dc5471ba5830135e6b614de43979cdaf;hpb=24ab436df2f3f115c1cb949dbf0a932cda7667b2;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-sort.c b/src/ui/gui/psppire-dialog-action-sort.c
index 2a80a6e7dc..8377e9592f 100644
--- a/src/ui/gui/psppire-dialog-action-sort.c
+++ b/src/ui/gui/psppire-dialog-action-sort.c
@@ -36,7 +36,8 @@ generate_syntax (PsppireDialogAction *act)
   gchar *text;
   GString *string = g_string_new ("SORT CASES BY ");
 
-  gint n_vars = psppire_var_view_append_names (scd->variables, 0, string);
+  PsppireVarView *var_view = PSPPIRE_VAR_VIEW (scd->variables);
+  gint n_vars = psppire_var_view_append_names (var_view, 0, string);
 
   if ( n_vars == 0 )
     {
@@ -45,7 +46,8 @@ generate_syntax (PsppireDialogAction *act)
   else
     {
       const char up_down =
-	gtk_toggle_button_get_active (scd->ascending) ? 'A' : 'D';
+	(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scd->ascending))
+         ? 'A' : 'D');
       g_string_append_printf (string, "(%c)", up_down);
       g_string_append (string, ".");
     }
@@ -66,14 +68,14 @@ reset (PsppireDialogAction *act)
 
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
 
-  gtk_toggle_button_set_active (scd->ascending, TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (scd->ascending), TRUE);
 }
 
 
 
 
 static gboolean
-dialog_state_valid (PsppireDialogAction *act)
+dialog_state_valid (gpointer act)
 {
   PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
   GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (scd->variables));
@@ -88,16 +90,23 @@ dialog_state_valid (PsppireDialogAction *act)
 
 
 static void
-psppire_dialog_action_sort_activate (GtkAction *a)
+psppire_dialog_action_sort_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
 
-  GtkBuilder *xml = builder_new ("sort.ui");
-  pda->dialog = get_widget_assert   (xml, "sort-cases-dialog");
-  pda->source = get_widget_assert   (xml, "sort-cases-treeview1");
+  GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+  GtkBuilder *xml = g_hash_table_lookup (thing, a);
+  if (!xml)
+    {
+      xml = builder_new ("sort.ui");
+      g_hash_table_insert (thing, a, xml);
+    }
+
+  pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
+  pda->source = get_widget_assert (xml, "sort-cases-treeview1");
   
-  act->variables =  get_widget_assert   (xml, "sort-cases-treeview2");
+  act->variables =  get_widget_assert (xml, "sort-cases-treeview2");
   act->ascending = get_widget_assert (xml, "sort-cases-radiobutton0");
 
   psppire_dialog_action_set_refresh (pda, reset);
@@ -112,10 +121,8 @@ psppire_dialog_action_sort_activate (GtkAction *a)
 static void
 psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-  PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_sort_activate;
+ PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
+  psppire_dialog_action_set_activation (class, psppire_dialog_action_sort_activate);
 
   pdac->generate_syntax = generate_syntax;
 }