projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Barchart Dialog: Cosmetic improvements
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-logistic.c
diff --git
a/src/ui/gui/psppire-dialog-action-logistic.c
b/src/ui/gui/psppire-dialog-action-logistic.c
index 85137868c624cc9b854a036015f48dcd4395e417..074b8e145621af4a1b2cf4b0d72ea35bd836c967 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-logistic.c
+++ b/
src/ui/gui/psppire-dialog-action-logistic.c
@@
-27,7
+27,6
@@
#include "psppire-dialog.h"
#include "builder-wrapper.h"
#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
@@
-103,7
+102,13
@@
psppire_dialog_action_logistic_activate (GtkAction *a)
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkWidget *opts_button;
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkWidget *opts_button;
- GtkBuilder *xml = builder_new ("logistic.ui");
+ GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("logistic.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
pda->dialog = get_widget_assert (xml, "logistic-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "logistic-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-135,8
+140,6
@@
psppire_dialog_action_logistic_activate (GtkAction *a)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
- g_object_unref (xml);
-
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,
@@
-192,9
+195,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class)
{
static void
psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_logistic_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_logistic_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}