projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated objects GtkAction and GtkUIManager
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-rank.c
diff --git
a/src/ui/gui/psppire-dialog-action-rank.c
b/src/ui/gui/psppire-dialog-action-rank.c
index f4d59b7be2df5ee77866b7b2af09d2c0c07c14e5..16adb9f707b2ffeb390eb98b9ef8538776a2eada 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-rank.c
+++ b/
src/ui/gui/psppire-dialog-action-rank.c
@@
-36,7
+36,7
@@
G_DEFINE_TYPE (PsppireDialogActionRank, psppire_dialog_action_rank, PSPPIRE_TYPE
static char *
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionRank *rd = PSPPIRE_DIALOG_ACTION_RANK (act);
{
PsppireDialogActionRank *rd = PSPPIRE_DIALOG_ACTION_RANK (act);
@@
-207,12
+207,18
@@
set_sensitivity (PsppireDialogActionRank *dar)
}
static void
}
static void
-psppire_dialog_action_rank_activate (
Gtk
Action *a)
+psppire_dialog_action_rank_activate (
PsppireDialog
Action *a)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionRank *act = PSPPIRE_DIALOG_ACTION_RANK (a);
- GtkBuilder *xml = builder_new ("rank.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("rank.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
GtkWidget *types_button = get_widget_assert (xml, "button1");
GtkWidget *ties_button = get_widget_assert (xml, "button2");
GtkWidget *types_button = get_widget_assert (xml, "button1");
GtkWidget *ties_button = get_widget_assert (xml, "button2");
@@
-292,15
+298,12
@@
psppire_dialog_action_rank_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid);
psppire_dialog_action_set_refresh (pda, dialog_refresh);
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_rank_parent_class)->activate (pda);
-
- g_object_unref (xml);
}
static void
psppire_dialog_action_rank_class_init (PsppireDialogActionRankClass *class)
{
}
static void
psppire_dialog_action_rank_class_init (PsppireDialogActionRankClass *class)
{
-
GTK_ACTION_CLASS (class)->activate = psppire_dialog_action_rank_activate
;
+
psppire_dialog_action_set_activation (class, psppire_dialog_action_rank_activate)
;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}