projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed goto case dialog
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-k-related.c
diff --git
a/src/ui/gui/psppire-dialog-action-k-related.c
b/src/ui/gui/psppire-dialog-action-k-related.c
index 387dbd30487dba35e85e99274bd6545572c6a83a..8c088f81ebbcb451789b99606c19d0ec24727f18 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-k-related.c
+++ b/
src/ui/gui/psppire-dialog-action-k-related.c
@@
-30,7
+30,7
@@
static void psppire_dialog_action_k_related_class_init (PsppireDialogAction
G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
G_DEFINE_TYPE (PsppireDialogActionKRelated, psppire_dialog_action_k_related, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act);
gchar *text;
{
PsppireDialogActionKRelated *krd = PSPPIRE_DIALOG_ACTION_K_RELATED (act);
gchar *text;
@@
-78,11
+78,11
@@
dialog_state_valid (gpointer data)
return FALSE;
/* At least one checkbutton must be active */
return FALSE;
/* At least one checkbutton must be active */
- if (
+ if (
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->friedman))
- &&
+ &&
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->kendal))
- &&
+ &&
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))
)
return FALSE;
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (krd->cochran))
)
return FALSE;
@@
-104,13
+104,14
@@
refresh (PsppireDialogAction *rd_)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (krd->cochran), FALSE);
}
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (krd->cochran), FALSE);
}
-static
void
-psppire_dialog_action_k_related_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_k_related_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionKRelated *act = PSPPIRE_DIALOG_ACTION_K_RELATED (a);
- GtkBuilder *xml = builder_new ("k-related.ui");
+ GtkBuilder *xml = builder_new ( "k-related.ui");
+
pda->dialog = get_widget_assert (xml, "k-related-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "k-related-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-126,16
+127,13
@@
psppire_dialog_action_k_related_activate (GtkAction *a)
"predicate", var_is_numeric,
NULL);
"predicate", var_is_numeric,
NULL);
- g_object_unref (xml);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_k_related_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
{
}
static void
psppire_dialog_action_k_related_class_init (PsppireDialogActionKRelatedClass *class)
{
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_k_related_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_k_related_activate
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}