changeset 15629:909056c81fcf

Undo previous change. (XTread_socket): Better way to avoid sending toolkit-specific events to Emacs.
author Karl Heuer <kwzh@gnu.org>
date Sun, 07 Jul 1996 22:58:51 +0000
parents f74c79dcaf8d
children de5c3eda52fc
files src/xterm.c
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Sun Jul 07 22:46:15 1996 +0000
+++ b/src/xterm.c	Sun Jul 07 22:58:51 1996 +0000
@@ -3616,6 +3616,14 @@
 		  unsigned char copy_buffer[81];
 		  int modifiers;
 
+                  if (lw_window_is_in_menubar (event.xkey.window,
+                                               f->output_data.x->menubar_widget
+                                               ))
+                    {
+                      XtDispatchEvent (&event);
+                      break;
+                    }
+                                               
 		  event.xkey.state
 		    |= x_emacs_to_x_modifiers (FRAME_X_DISPLAY_INFO (f),
 					       extra_keyboard_modifiers);
@@ -3651,13 +3659,6 @@
 					  80, &keysym, &compose_status);
 #endif
 
-#ifdef USE_X_TOOLKIT
-                  if (lw_toolkit_related_event_p (&event))
-                    {
-                      XtDispatchEvent (&event);
-                      break;
-                    }
-#endif
 		  orig_keysym = keysym;
 
 		  if (numchars > 1)