[Emacs-diffs] Changes to emacs/src/xmenu.c

[Jan Djärv]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.251 emacs/src/xmenu.c:1.252
*** emacs/src/xmenu.c:1.251     Sun Nov  2 11:47:32 2003
--- emacs/src/xmenu.c   Sun Nov 16 11:05:23 2003
***************
*** 610,616 ****
  #endif /* not HAVE_BOXES */
  
  #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
!   if (!NILP(map))
      /* Indicate visually that this is a submenu.  */
      item_string = concat2 (item_string, build_string (" >"));
  #endif
--- 610,616 ----
  #endif /* not HAVE_BOXES */
  
  #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
!   if (!NILP (map))
      /* Indicate visually that this is a submenu.  */
      item_string = concat2 (item_string, build_string (" >"));
  #endif
***************
*** 696,702 ****
     the scroll bar or the edit window.  Fx_popup_menu needs to be
     sure it is the edit window.  */
  static void
! mouse_position_for_popup(f, x, y)
       FRAME_PTR f;
       int *x;
       int *y;
--- 696,702 ----
     the scroll bar or the edit window.  Fx_popup_menu needs to be
     sure it is the edit window.  */
  static void
! mouse_position_for_popup (f, x, y)
       FRAME_PTR f;
       int *x;
       int *y;
***************
*** 1217,1223 ****
      return;
  
  #ifdef USE_GTK
!   if (! xg_win_to_widget (f->output_data.x->saved_menu_event->xany.window))
      return;
  #endif
  
--- 1217,1224 ----
      return;
  
  #ifdef USE_GTK
!   if (! xg_win_to_widget (FRAME_X_DISPLAY (f),
!                           f->output_data.x->saved_menu_event->xany.window))
      return;
  #endif