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

[Jan Djärv]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.260 emacs/src/xmenu.c:1.261
*** emacs/src/xmenu.c:1.260     Tue Sep  7 05:52:52 2004
--- emacs/src/xmenu.c   Sun Oct 31 15:29:04 2004
***************
*** 110,120 ****
  extern Lisp_Object Qmenu_bar_update_hook;
  
  #ifdef USE_X_TOOLKIT
! extern void set_frame_menubar ();
  extern XtAppContext Xt_app_con;
  
! static Lisp_Object xdialog_show ();
! static void popup_get_selection ();
  
  /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
  
--- 110,121 ----
  extern Lisp_Object Qmenu_bar_update_hook;
  
  #ifdef USE_X_TOOLKIT
! extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
  extern XtAppContext Xt_app_con;
  
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
! static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
!                                      LWLIB_ID, int));
  
  /* Define HAVE_BOXES if menus can handle radio and toggle buttons.  */
  
***************
*** 124,131 ****
  #ifdef USE_GTK
  #include "gtkutil.h"
  #define HAVE_BOXES 1
! extern void set_frame_menubar ();
! static Lisp_Object xdialog_show ();
  #endif
  
  /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU
--- 125,132 ----
  #ifdef USE_GTK
  #include "gtkutil.h"
  #define HAVE_BOXES 1
! extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
  #endif
  
  /* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU
***************
*** 156,162 ****
  static void list_of_panes P_ ((Lisp_Object));
  static void list_of_items P_ ((Lisp_Object));
  
- extern EMACS_TIME timer_check P_ ((int));
  
  /* This holds a Lisp vector that holds the results of decoding
     the keymaps or alist-of-alists that specify a menu.
--- 157,162 ----
***************
*** 1128,1148 ****
  
  #ifdef USE_X_TOOLKIT
  static void
! popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
       XEvent *initial_event;
       struct x_display_info *dpyinfo;
       LWLIB_ID id;
-      int do_timers;
       int down_on_keypress;
  {
    XEvent event;
  
    while (popup_activated_flag)
      {
-       /* If we have no events to run, consider timers.  */
-       if (do_timers && !XtAppPending (Xt_app_con))
-         timer_check (1);
- 
        if (initial_event)
          {
            event = *initial_event;
--- 1128,1143 ----
  
  #ifdef USE_X_TOOLKIT
  static void
! popup_get_selection (initial_event, dpyinfo, id, down_on_keypress)
       XEvent *initial_event;
       struct x_display_info *dpyinfo;
       LWLIB_ID id;
       int down_on_keypress;
  {
    XEvent event;
  
    while (popup_activated_flag)
      {
        if (initial_event)
          {
            event = *initial_event;
***************
*** 2489,2495 ****
    popup_activated_flag = 1;
  
    /* Process events that apply to the menu.  */
!   popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0, 0);
  
    /* fp turned off the following statement and wrote a comment
       that it is unnecessary--that the menu has already disappeared.
--- 2484,2490 ----
    popup_activated_flag = 1;
  
    /* Process events that apply to the menu.  */
!   popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id, 0);
  
    /* fp turned off the following statement and wrote a comment
       that it is unnecessary--that the menu has already disappeared.
***************
*** 2883,2890 ****
                             Fcons (make_number (dialog_id >> (fact)),
                                    make_number (dialog_id & ~(-1 << (fact)))));
  
!     popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f),
!                          dialog_id, 1, 1);
  
      unbind_to (count, Qnil);
    }
--- 2878,2884 ----
                             Fcons (make_number (dialog_id >> (fact)),
                                    make_number (dialog_id & ~(-1 << (fact)))));
  
!     popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id, 
1);
  
      unbind_to (count, Qnil);
    }