projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide wrapper for gtk_menu_popup_at_pointer.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-sort.c
diff --git
a/src/ui/gui/psppire-dialog-action-sort.c
b/src/ui/gui/psppire-dialog-action-sort.c
index c911d437f7489b17aa8cec3430a24cc6b1bb7783..f59cc42589396502a5ac26349659be4b7b0df110 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-sort.c
+++ b/
src/ui/gui/psppire-dialog-action-sort.c
@@
-30,7
+30,7
@@
static void psppire_dialog_action_sort_class_init (PsppireDialogActionSortC
G_DEFINE_TYPE (PsppireDialogActionSort, psppire_dialog_action_sort, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
G_DEFINE_TYPE (PsppireDialogActionSort, psppire_dialog_action_sort, PSPPIRE_TYPE_DIALOG_ACTION);
static char *
-generate_syntax (PsppireDialogAction *act)
+generate_syntax (
const
PsppireDialogAction *act)
{
PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
gchar *text;
{
PsppireDialogActionSort *scd = PSPPIRE_DIALOG_ACTION_SORT (act);
gchar *text;
@@
-89,23
+89,17
@@
dialog_state_valid (gpointer act)
}
}
-static
void
-psppire_dialog_action_sort_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_sort_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
{
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
PsppireDialogActionSort *act = PSPPIRE_DIALOG_ACTION_SORT (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("sort.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "sort.ui");
pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
pda->source = get_widget_assert (xml, "sort-cases-treeview1");
pda->dialog = get_widget_assert (xml, "sort-cases-dialog");
pda->source = get_widget_assert (xml, "sort-cases-treeview1");
-
+
act->variables = get_widget_assert (xml, "sort-cases-treeview2");
act->ascending = get_widget_assert (xml, "sort-cases-radiobutton0");
act->variables = get_widget_assert (xml, "sort-cases-treeview2");
act->ascending = get_widget_assert (xml, "sort-cases-radiobutton0");
@@
-113,18
+107,16
@@
psppire_dialog_action_sort_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
-
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_sort_parent_class)->activate (pda);
+ return xml;
}
static void
psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
}
static void
psppire_dialog_action_sort_class_init (PsppireDialogActionSortClass *class)
{
PsppireDialogActionClass *pdac = PSPPIRE_DIALOG_ACTION_CLASS (class);
-
psppire_dialog_action_set_activation (class, psppire_dialog_action_sort_activate)
;
+
PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_sort_activate
;
-
pdac->generate_syntax = generate_syntax;
+ pdac->generate_syntax = generate_syntax;
}
}