mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

* xmenu.c: Add prototypes for forward function declarations.

Browse Source 
(popup_get_selection): Remove parameter do_timers, remove call to
timer_check.
(create_and_show_popup_menu, create_and_show_dialog): Remove
parameter do_timers from call to popup_get_selection.
This commit is contained in:
Jan Djärv 2004-10-31 15:29:04 +00:00
parent 12e6566a25
commit 495ef86be2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,5 +1,11 @@
2004-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c: Add prototypes for forward function declarations.
(popup_get_selection): Remove parameter do_timers, remove call to
timer_check.
(create_and_show_popup_menu, create_and_show_dialog): Remove
parameter do_timers from call to popup_get_selection.
* xdisp.c (update_tool_bar): Pass a copy of f->tool_bar_items to
tool_bar_items and assign the result to f->tool_bar_items if
not equal. Move BLOCK/UNBLOCK_INPUT from around call to

24
src/xmenu.c
View File

@ -110,11 +110,12 @@ extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
extern Lisp_Object Qmenu_bar_update_hook;
#ifdef USE_X_TOOLKIT
extern void set_frame_menubar ();
extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
extern XtAppContext Xt_app_con;
static Lisp_Object xdialog_show ();
static void popup_get_selection ();
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,8 +125,8 @@ static void popup_get_selection ();
#ifdef USE_GTK
#include "gtkutil.h"
#define HAVE_BOXES 1
extern void set_frame_menubar ();
static Lisp_Object xdialog_show ();
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,7 +157,6 @@ static void single_keymap_panes P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
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.
@ -1128,21 +1128,16 @@ on the left of the dialog box and all following items on the right.
#ifdef USE_X_TOOLKIT
static void
popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
popup_get_selection (initial_event, dpyinfo, id, 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;
@ -2489,7 +2484,7 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click)
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);
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,8 +2878,7 @@ create_and_show_dialog (f, first_wv)
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);
popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id, 1);
unbind_to (count, Qnil);
}