projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
marshaller-list: Remove unused marshallers
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-binomial.c
diff --git
a/src/ui/gui/psppire-dialog-action-binomial.c
b/src/ui/gui/psppire-dialog-action-binomial.c
index 0f63e0652f8c3ba0db4b25c7f302ea34e31b39a8..0a9f171f240c0e39cb2cdf4bef7ebb8b1a417122 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-binomial.c
+++ b/
src/ui/gui/psppire-dialog-action-binomial.c
@@
-53,7
+53,7
@@
get_proportion (PsppireDialogActionBinomial *act, double *prop)
if (endptr == text)
return FALSE;
if (endptr == text)
return FALSE;
- return TRUE;
+ return TRUE;
}
static gboolean
}
static gboolean
@@
-96,19
+96,13
@@
refresh (PsppireDialogAction *da)
}
}
-static
void
-psppire_dialog_action_binomial_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_binomial_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogActionBinomial *act = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionBinomial *act = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_pointer (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("binomial.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "binomial.ui");
pda->dialog = get_widget_assert (xml, "binomial-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "binomial-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-126,16
+120,14
@@
psppire_dialog_action_binomial_activate (GtkAction *a)
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
- dialog_state_valid);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_binomial_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_binomial_parent_class)->activate (pda);
+ dialog_state_valid);
+ return xml;
}
static char *
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (
const
PsppireDialogAction *a)
{
PsppireDialogActionBinomial *scd = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
gchar *text = NULL;
{
PsppireDialogActionBinomial *scd = PSPPIRE_DIALOG_ACTION_BINOMIAL (a);
gchar *text = NULL;
@@
-170,7
+162,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_binomial_class_init (PsppireDialogActionBinomialClass *class)
{
static void
psppire_dialog_action_binomial_class_init (PsppireDialogActionBinomialClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_binomial_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_binomial_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}