static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (const PsppireDialogAction *act)
{
PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (act);
gchar *text = NULL;
gboolean ok;
GtkTreeIter iter;
struct string dds;
-
+
ds_init_empty (&dds);
ds_put_cstr (&dds, "\nCOUNT ");
if (! cnt->value_list)
return FALSE;
- if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list), &iter) )
+ if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cnt->value_list), &iter))
return FALSE;
if (!gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (cnt->variable_treeview)), &iter))
gtk_list_store_clear (GTK_LIST_STORE (cnt->value_list));
}
-static void
-psppire_dialog_action_count_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_count_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionCount *act = PSPPIRE_DIALOG_ACTION_COUNT (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("count.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("count.ui");
GtkWidget *selector = get_widget_assert (xml, "count-selector1");
GtkWidget *button = get_widget_assert (xml, "button1");
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_count_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_count_class_init (PsppireDialogActionCountClass *class)
{
- psppire_dialog_action_set_activation (class,psppire_dialog_action_count_activate);
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_count_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data);
GValue ov_value = {0};
- if ( ! gtk_tree_selection_get_selected (selection, &model, &iter) )
+ if (! gtk_tree_selection_get_selected (selection, &model, &iter))
return;
gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
PsppireDialogActionCount *cnt = PSPPIRE_DIALOG_ACTION_COUNT (data);
PsppireValChooser *vc = PSPPIRE_VAL_CHOOSER (cnt->chooser);
struct old_value ov;
-
+
g_assert (col == 0);
psppire_val_chooser_get_status (vc, &ov);
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
- if ( response == PSPPIRE_RESPONSE_CONTINUE )
+ if (response == PSPPIRE_RESPONSE_CONTINUE)
{
g_object_unref (cd->value_list);
cd->value_list = local_store;