projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-delimited-text: Clear entire 'cache_starts' buffer.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-1sks.c
diff --git
a/src/ui/gui/psppire-dialog-action-1sks.c
b/src/ui/gui/psppire-dialog-action-1sks.c
index c79ebc577930eb248b95124fba6af364a36e8608..3814c7dccf19faa31d692f281f84a9897d6d0ce2 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-1sks.c
+++ b/
src/ui/gui/psppire-dialog-action-1sks.c
@@
-52,7
+52,7
@@
append_fragment (GString *string, const gchar *dist, PsppireVarView *vv)
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogAction1sks *rd = PSPPIRE_DIALOG_ACTION_1SKS (act);
gchar *text;
{
PsppireDialogAction1sks *rd = PSPPIRE_DIALOG_ACTION_1SKS (act);
gchar *text;
@@
-116,19
+116,13
@@
refresh (PsppireDialogAction *rd_)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->cb[i]), FALSE);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fd->cb[i]), FALSE);
}
-static
void
-psppire_dialog_action_1sks_activate (PsppireDialogAction *a)
+static
GtkBuilder *
+psppire_dialog_action_1sks_activate (PsppireDialogAction *a
, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogAction1sks *act = PSPPIRE_DIALOG_ACTION_1SKS (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("ks-one-sample.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "ks-one-sample.ui");
pda->dialog = get_widget_assert (xml, "ks-one-sample-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "ks-one-sample-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-142,15
+136,13
@@
psppire_dialog_action_1sks_activate (PsppireDialogAction *a)
psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid);
psppire_dialog_action_set_refresh (pda, refresh);
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_1sks_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_1sks_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_1sks_class_init (PsppireDialogAction1sksClass *class)
{
}
static void
psppire_dialog_action_1sks_class_init (PsppireDialogAction1sksClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_1sks_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_1sks_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}