diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-23 19:39:48 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-11-23 19:39:48 +0400 |
| commit | f418b22ee985bb6887c45856a1cabe2f5c726fca (patch) | |
| tree | 51417635f4321a34ffb460c8266866ec87f5a94c /src/w32menu.c | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
| download | emacs-f418b22ee985bb6887c45856a1cabe2f5c726fca.tar.gz emacs-f418b22ee985bb6887c45856a1cabe2f5c726fca.tar.bz2 emacs-f418b22ee985bb6887c45856a1cabe2f5c726fca.zip | |
* frame.h (struct frame): Remove display_preempted member
since all users are dead long ago.
* nsterm.h (struct x_output): Use the only dummy member.
* w32menu.c (pending_menu_activation): Remove since not
really used.
(set_frame_menubar): Adjust user.
* w32term.h (struct x_output): Drop outdated #if 0 code.
(struct w32_output): Use bitfields for explicit_parent,
asked_for_visible and menubar_active members. Drop
unused pending_menu_activation member.
* xterm.h (struct x_output): Drop outdated #if 0 code.
Use bitfields for explicit_parent, asked_for_visible,
has_been_visible and net_wm_state_hidden_seen members.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 36bf9574fdc..84fb1bdc71e 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -114,17 +114,6 @@ static int fill_in_menu (HMENU, widget_value *); void w32_free_menu_strings (HWND); - - -/* This is set nonzero after the user activates the menu bar, and set - to zero again after the menu bars are redisplayed by prepare_menu_bar. - While it is nonzero, all calls to set_frame_menubar go deep. - - I don't understand why this is needed, but it does seem to be - needed on Motif, according to Marcus Daniels <marcus@sysc.pdx.edu>. */ - -int pending_menu_activation; - #ifdef HAVE_MENUS DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, @@ -389,8 +378,6 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p) if (! menubar_widget) deep_p = 1; - else if (pending_menu_activation && !deep_p) - deep_p = 1; if (deep_p) { |