From 22174d100dbf907e34919377aa33599efd015968 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 19 Jan 2003 23:06:42 +0000 Subject: [PATCH] *** empty log message *** --- src/ChangeLog | 5 +++++ src/xterm.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 428a9ca6ae6..295609135a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-01-20 Jan D. + + * gtkutil.c (xg_create_frame_widgets): Check if there is an + external tool bar before setting tool bar height. + 2003-01-19 Jan D. * xterm.c (handle_one_xevent): Surround popup_activated diff --git a/src/xterm.c b/src/xterm.c index 348355d2b5b..08043900468 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10692,9 +10692,11 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) case KeyPress: +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) /* Dispatch KeyPress events when in menu. */ if (popup_activated ()) goto OTHER; +#endif f = x_any_window_to_frame (dpyinfo, event.xkey.window); @@ -11375,7 +11377,9 @@ handle_one_xevent (dpyinfo, eventp, bufp_r, numcharsp, finish) if (!dpyinfo->x_focus_frame || f == dpyinfo->x_focus_frame) { +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) if (! popup_activated ()) +#endif construct_mouse_click (&emacs_event, &event, f); } } -- 2.39.2