X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dictview.c;h=a42b80d5bc16e4280b32b3e0dd93363467b22376;hb=d90a738745006b2696994bec344c160fca1f755b;hp=37361455f81239556a90d31238604bb9f62da4ea;hpb=158b6b7f7f3c1ea4ea4443ecb87d2a980808577b;p=pspp

diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c
index 37361455f8..a42b80d5bc 100644
--- a/src/ui/gui/psppire-dictview.c
+++ b/src/ui/gui/psppire-dictview.c
@@ -189,15 +189,15 @@ set_model (PsppireDictView *dict_view)
 {
   GtkTreeModel *model = NULL;
 
-  if ( dict_view->dict == NULL)
+  if (dict_view->dict == NULL)
     return;
 
   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 )
+   if (dict_view->predicate)
     {
       model = gtk_tree_model_filter_new (dict_view->sorted_model,	 NULL);
 
@@ -491,7 +491,7 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
 
   gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR,  &var, -1);
 
-  if ( ! var_has_label (var))
+  if (! var_has_label (var))
     return FALSE;
 
   {
@@ -500,7 +500,7 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
 
     get_base_model (tree_model, NULL, &m, NULL);
 
-    if ( use_labels (PSPPIRE_DICT_VIEW (treeview)))
+    if (use_labels (PSPPIRE_DICT_VIEW (treeview)))
       tip = var_get_name (var);
     else
       tip = var_get_label (var);
@@ -512,13 +512,12 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
 }
 
 static gboolean
-show_menu (PsppireDictView *dv, GdkEventButton *event, gpointer data)
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
 {
-  if (event->button != 3)
+  if (((GdkEventButton *) event)->button != 3)
     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;
 }
@@ -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);
-  
+
   gtk_check_menu_item_set_inconsistent (checkbox, FALSE);
-  
+
   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);
-    
+
     g_signal_connect (item, "toggled",
 		      G_CALLBACK (toggle_label_preference), dict_view);