X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-crosstabs.c;h=79baec16dc7cc4e2bfee5e0a9e92f787711fe895;hb=37cd3133c06caf3fce7e449a939098f62bd41a55;hp=b0b08b5ce6fd9356f58349e031098aa308fd891a;hpb=4e3feede0f6b3d2e67d6e41a9ddea3738e574dc3;p=pspp

diff --git a/src/ui/gui/psppire-dialog-action-crosstabs.c b/src/ui/gui/psppire-dialog-action-crosstabs.c
index b0b08b5ce6..79baec16dc 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));
     }
 }
@@ -202,13 +202,13 @@ on_statistics_clicked (PsppireDialogActionCrosstabs *cd)
 }
 
 
-static void
-psppire_dialog_action_crosstabs_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_crosstabs_activate (PsppireDialogAction *a, GVariant *param)
 {
   PsppireDialogActionCrosstabs *act = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
 
-  GtkBuilder *xml = builder_new ("crosstabs.ui");
+  GtkBuilder *xml = builder_new ( "crosstabs.ui");
 
   pda->dialog = get_widget_assert   (xml, "crosstabs-dialog");
   pda->source = get_widget_assert   (xml, "dict-treeview");
@@ -228,31 +228,28 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
   act->table_button = get_widget_assert (xml, "print-tables");
   act->pivot_button = get_widget_assert (xml, "pivot");
 
-
-  g_object_unref (xml);
-
   act->format_options_avalue = TRUE;
   act->format_options_table = TRUE;
   act->format_options_pivot = TRUE;
 
   psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
-  				  B_CS_CELL_DEFAULT,
-  				  N_CROSSTABS_CELLS,
-  				  cells);
+				      B_CS_CELL_DEFAULT,
+				      N_CROSSTABS_CELLS,
+				      cells);
 
   act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
 
   psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
-  				  B_CS_STATS_DEFAULT,
-  				  N_CROSSTABS_STATS,
-  				  stats);
+				      B_CS_STATS_DEFAULT,
+				      N_CROSSTABS_STATS,
+				      stats);
 
   act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
 
   psppire_dialog_action_set_refresh (pda, refresh);
 
   psppire_dialog_action_set_valid_predicate (pda,
-					dialog_state_valid);
+					     dialog_state_valid);
 
   g_signal_connect_swapped (act->cell_button, "clicked",
 			    G_CALLBACK (on_cell_clicked), act);
@@ -263,15 +260,13 @@ psppire_dialog_action_crosstabs_activate (GtkAction *a)
   g_signal_connect_swapped (act->format_button, "clicked",
 			    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);
+  return xml;
 }
 
 
 
 static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
 {
   PsppireDialogActionCrosstabs *cd = PSPPIRE_DIALOG_ACTION_CROSSTABS (a);
   gchar *text = NULL;
@@ -291,7 +286,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, " ");
 
@@ -303,20 +298,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);
     }
 
@@ -337,15 +332,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);
     }
 
@@ -378,10 +373,7 @@ generate_syntax (PsppireDialogAction *a)
 static void
 psppire_dialog_action_crosstabs_class_init (PsppireDialogActionCrosstabsClass *class)
 {
-  GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
-  action_class->activate = psppire_dialog_action_crosstabs_activate;
-
+  PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_crosstabs_activate;
   PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
 }
 
@@ -390,4 +382,3 @@ static void
 psppire_dialog_action_crosstabs_init (PsppireDialogActionCrosstabs *act)
 {
 }
-