PsppireDataEditor: Automatically set the dictionary as hmodel when the data store...

[pspp] / src / ui / gui / psppire-dialog-action-factor.c

diff --git a/src/ui/gui/psppire-dialog-action-factor.c b/src/ui/gui/psppire-dialog-action-factor.c
index de33c5c5fa5a3573c89219e06d36c5fde576c1ad..1debfc674a3cd260725d28b183157fc28c58f711 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-factor.c
+++ b/src/ui/gui/psppire-dialog-action-factor.c
@@ -38,7 +38,7 @@ static void psppire_dialog_action_factor_class_init      (PsppireDialogActionFac
 
 G_DEFINE_TYPE (PsppireDialogActionFactor, psppire_dialog_action_factor, PSPPIRE_TYPE_DIALOG_ACTION);
 
-static const char *rot_method_syntax[] = 
+static const char *rot_method_syntax[] =
   {
     "NOROTATE",
     "VARIMAX",
@@ -56,7 +56,7 @@ on_extract_toggle (GtkToggleButton *button, PsppireDialogActionFactor *f)
 }
 
 static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
 {
   PsppireDialogActionFactor *rd  = PSPPIRE_DIALOG_ACTION_FACTOR (act);
 
@@ -105,7 +105,7 @@ generate_syntax (PsppireDialogAction *act)
   ds_put_cstr (&str, "\n\t/PRINT = ");
   ds_put_cstr (&str, "INITIAL ");
 
-  if ( rd->extraction.unrotated )  
+  if ( rd->extraction.unrotated )
     ds_put_cstr (&str, "EXTRACTION ");
 
   if ( rd->rotation.rotated_solution )
@@ -133,7 +133,7 @@ load_rotation_parameters (PsppireDialogActionFactor *fd, const struct rotation_p
 {
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->display_rotated_solution),
                                p->rotated_solution);
-  
+
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (fd->rotate_iterations),
                             p->iterations);
 
@@ -184,7 +184,7 @@ load_extraction_parameters (PsppireDialogActionFactor *fd, const struct extracti
     gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 1);
   else
     gtk_combo_box_set_active (GTK_COMBO_BOX (fd->extraction_combo), 0);
-    
+
 }
 
 static gboolean
@@ -294,14 +294,14 @@ run_rotations_subdialog (PsppireDialogActionFactor *act)
 }
 
 static void
-psppire_dialog_action_factor_activate (GtkAction *a)
+psppire_dialog_action_factor_activate (PsppireDialogAction *a)
 {
   PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
   PsppireDialogActionFactor *act = PSPPIRE_DIALOG_ACTION_FACTOR (a);
   GtkWidget *extraction_button ;
   GtkWidget *rotation_button ;
 
-  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)
     {
@@ -370,7 +370,6 @@ psppire_dialog_action_factor_activate (GtkAction *a)
   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_factor_parent_class)->activate (pda);
 }
 
 static void