/[emacs]/emacs/src/xmenu.c
ViewVC logotype

Diff of /emacs/src/xmenu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.277 by jhd, Mon Dec 27 20:56:56 2004 UTC revision 1.278 by jhd, Fri Jan 7 20:50:46 2005 UTC
# Line 2454  create_and_show_popup_menu (f, first_wv, Line 2454  create_and_show_popup_menu (f, first_wv,
2454                             G_CALLBACK (menu_highlight_callback));                             G_CALLBACK (menu_highlight_callback));
2455    xg_crazy_callback_abort = 0;    xg_crazy_callback_abort = 0;
2456    
   for (i = 0; i < 5; i++)  
     if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))  
       break;  
   
2457    if (! for_click)    if (! for_click)
2458      {      {
2459        /* Not invoked by a click.  pop up at x/y.  */        /* Not invoked by a click.  pop up at x/y.  */
# Line 2470  create_and_show_popup_menu (f, first_wv, Line 2466  create_and_show_popup_menu (f, first_wv,
2466        popup_x_y.x = x;        popup_x_y.x = x;
2467        popup_x_y.y = y;        popup_x_y.y = y;
2468        popup_x_y.f = f;        popup_x_y.f = f;
     }  
2469    
2470          i = 0;  /* gtk_menu_popup needs this to be 0 for a non-button popup.  */
2471        }
2472      else
2473        {
2474          for (i = 0; i < 5; i++)
2475            if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
2476              break;
2477        }
2478      
2479    /* Display the menu.  */    /* Display the menu.  */
2480    gtk_widget_show_all (menu);    gtk_widget_show_all (menu);
2481    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);

Legend:
Removed from v.1.277  
changed lines
  Added in v.1.278

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26