X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-crosstabs.c;h=8c1891d918cc72ba07e1efac05123c2a636529a4;hb=eff2701d5d282bfc0c1b52bd2af985705b11b307;hp=aa5c86cc85880f87dbcb1f90f146cfda995a91e5;hpb=89cbb0a7f4f31bc826621ffff9138fc4743f2b11;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c
index aa5c86cc85..8c1891d918 100644
--- a/src/ui/gui/psppire-dialog-action-crosstabs.c
+++ b/src/ui/gui/psppire-dialog-action-crosstabs.c
@@ -51,7 +51,7 @@ dialog_state_valid (gpointer data)
 
   GtkTreeIter notused;
 
-  return (gtk_tree_model_get_iter_first (row_vars, &notused) 
+  return (gtk_tree_model_get_iter_first (row_vars, &notused)
     && gtk_tree_model_get_iter_first (col_vars, &notused));
 }
 
@@ -62,7 +62,7 @@ refresh (PsppireDialogAction *rd_)
 
   GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_rows));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
-  
+
   liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (cd->dest_cols));
   gtk_list_store_clear (GTK_LIST_STORE (liststore));
 }
@@ -159,7 +159,7 @@ on_format_clicked (PsppireDialogActionCrosstabs *cd)
       cd->format_options_table =
 	gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->table_button));
 
-      cd->format_options_pivot = 
+      cd->format_options_pivot =
 	gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cd->pivot_button));
     }
 }
@@ -203,12 +203,12 @@ on_statistics_clicked (PsppireDialogActionCrosstabs *cd)
 
 
 static void
-psppire_dialog_action_crosstabs_activate (GtkAction *a)
+psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a)
 {
   PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (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)
     {
@@ -266,15 +266,12 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
 				G_CALLBACK (on_format_clicked), act);
 
     }
-  
-  if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate)
-    PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_crosstabs_parent_class)->activate (pda);
 }
 
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionCrosstabs *cd = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
   gchar *text = NULL;
@@ -294,7 +291,7 @@ generate_syntax (PsppireDialogAction *a)
 
   if (cd->format_options_avalue)
     g_string_append (string, "AVALUE");
-  else 
+  else
     g_string_append (string, "DVALUE");
   g_string_append (string, " ");
 
@@ -306,20 +303,20 @@ generate_syntax (PsppireDialogAction *a)
 
   if (cd->format_options_pivot)
     g_string_append (string, "PIVOT");
-  else 
+  else
     g_string_append (string, "NOPIVOT");
 
 
   selected = 0;
-  for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok; 
+  for (i = 0, ok = gtk_tree_model_get_iter_first (cd->stat, &iter); ok;
        i++, ok = gtk_tree_model_iter_next (cd->stat, &iter))
     {
       gboolean toggled;
       gtk_tree_model_get (cd->stat, &iter,
-			  CHECKBOX_COLUMN_SELECTED, &toggled, -1); 
-      if (toggled) 
-	selected |= 1u << i; 
-      else 
+			  CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+      if (toggled)
+	selected |= 1u << i;
+      else
 	selected &= ~(1u << i);
     }
 
@@ -340,15 +337,15 @@ generate_syntax (PsppireDialogAction *a)
     }
 
   selected = 0;
-  for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok; 
+  for (i = 0, ok = gtk_tree_model_get_iter_first (cd->cell, &iter); ok;
        i++, ok = gtk_tree_model_iter_next (cd->cell, &iter))
     {
       gboolean toggled;
       gtk_tree_model_get (cd->cell, &iter,
-			  CHECKBOX_COLUMN_SELECTED, &toggled, -1); 
-      if (toggled) 
-	selected |= 1u << i; 
-      else 
+			  CHECKBOX_COLUMN_SELECTED, &toggled, -1);
+      if (toggled)
+	selected |= 1u << i;
+      else
 	selected &= ~(1u << i);
     }