Mercurial > emacs
comparison src/xdisp.c @ 109391:a4e57fa6eb3f
Fix menu bar activation with click for Motif/Lesstif.
* src/xdisp.c (pending_menu_activation): Remove extern declaration.
(prepare_menu_bars): Remove setting of pending_menu_activation.
* src/xmenu.c (pending_menu_activation): Remove.
(x_activate_menubar): Set popup_activated_flag for Xt also. Remove
setting of pending_menu_activation.
(set_frame_menubar): Remove check of pending_menu_activation.
Declare menubar_size before code. Correct spelling in comment.
* src/xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype.
(SET_SAVED_KEY_EVENT): Remove (not used).
(SET_SAVED_MENU_EVENT): Rename to SET_SAVED_BUTTON_EVENT and
remove size parameter.
(handle_one_xevent): Check popup_activated () for menu for Xt also.
Remove #ifdef USE_GTK around finish = X_EVENT_DROP.
Remove #ifdef USE_MOTIF code that did SET_SAVED_BUTTON_EVENT for
ButtonRelease.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 14 Jul 2010 16:32:25 +0200 |
| parents | 4e99d7aa7526 |
| children | 05e7e7c46ff0 |
comparison
equal
deleted
inserted
replaced
| 109389:b019ae044fb3 | 109391:a4e57fa6eb3f |
|---|---|
| 269 #define INFINITY 10000000 | 269 #define INFINITY 10000000 |
| 270 | 270 |
| 271 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ | 271 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ |
| 272 || defined(HAVE_NS) || defined (USE_GTK) | 272 || defined(HAVE_NS) || defined (USE_GTK) |
| 273 extern void set_frame_menubar (struct frame *f, int, int); | 273 extern void set_frame_menubar (struct frame *f, int, int); |
| 274 extern int pending_menu_activation; | |
| 275 #endif | 274 #endif |
| 276 | 275 |
| 277 extern int interrupt_input; | 276 extern int interrupt_input; |
| 278 extern int command_loop_level; | 277 extern int command_loop_level; |
| 279 | 278 |
| 9864 update_menu_bar (sf, 1, 0); | 9863 update_menu_bar (sf, 1, 0); |
| 9865 #ifdef HAVE_WINDOW_SYSTEM | 9864 #ifdef HAVE_WINDOW_SYSTEM |
| 9866 update_tool_bar (sf, 1); | 9865 update_tool_bar (sf, 1); |
| 9867 #endif | 9866 #endif |
| 9868 } | 9867 } |
| 9869 | |
| 9870 /* Motif needs this. See comment in xmenu.c. Turn it off when | |
| 9871 pending_menu_activation is not defined. */ | |
| 9872 #ifdef USE_X_TOOLKIT | |
| 9873 pending_menu_activation = 0; | |
| 9874 #endif | |
| 9875 } | 9868 } |
| 9876 | 9869 |
| 9877 | 9870 |
| 9878 /* Update the menu bar item list for frame F. This has to be done | 9871 /* Update the menu bar item list for frame F. This has to be done |
| 9879 before we start to fill in any display lines, because it can call | 9872 before we start to fill in any display lines, because it can call |