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-dictview.c
diff --git
a/src/ui/gui/psppire-dictview.c
b/src/ui/gui/psppire-dictview.c
index 37361455f81239556a90d31238604bb9f62da4ea..fc2c0325613f81d8c7534e831efa232940766b2e 100644
(file)
--- a/
src/ui/gui/psppire-dictview.c
+++ b/
src/ui/gui/psppire-dictview.c
@@
-194,7
+194,7
@@
set_model (PsppireDictView *dict_view)
dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict));
gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dict_view->sorted_model), default_sort, dict_view, 0);
dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict));
gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dict_view->sorted_model), default_sort, dict_view, 0);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
if ( dict_view->predicate )
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
if ( dict_view->predicate )
@@
-512,13
+512,12
@@
set_tooltip_for_variable (GtkTreeView *treeview,
}
static gboolean
}
static gboolean
-show_menu (PsppireDictView *dv, GdkEvent
Button
*event, gpointer data)
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
{
{
- if (
event
->button != 3)
+ if (
((GdkEventButton *) event)
->button != 3)
return FALSE;
return FALSE;
- gtk_menu_popup (GTK_MENU (dv->menu), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer (GTK_MENU (dv->menu), event);
return TRUE;
}
return TRUE;
}
@@
-534,9
+533,9
@@
toggle_label_preference (GtkCheckMenuItem *checkbox, gpointer data)
if (gtk_check_menu_item_get_inconsistent (checkbox))
gtk_check_menu_item_set_active (checkbox, !global_setting);
if (gtk_check_menu_item_get_inconsistent (checkbox))
gtk_check_menu_item_set_active (checkbox, !global_setting);
-
+
gtk_check_menu_item_set_inconsistent (checkbox, FALSE);
gtk_check_menu_item_set_inconsistent (checkbox, FALSE);
-
+
gtk_widget_queue_draw (GTK_WIDGET (dv));
}
gtk_widget_queue_draw (GTK_WIDGET (dv));
}
@@
-642,7
+641,7
@@
psppire_dict_view_init (PsppireDictView *dict_view)
dict_view->override_button = item;
gtk_check_menu_item_set_inconsistent (GTK_CHECK_MENU_ITEM (item),
TRUE);
dict_view->override_button = item;
gtk_check_menu_item_set_inconsistent (GTK_CHECK_MENU_ITEM (item),
TRUE);
-
+
g_signal_connect (item, "toggled",
G_CALLBACK (toggle_label_preference), dict_view);
g_signal_connect (item, "toggled",
G_CALLBACK (toggle_label_preference), dict_view);