Mercurial > emacs
changeset 49326:f5372eee5041
*** empty log message ***
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 19 Jan 2003 23:06:42 +0000 |
| parents | 3aad85888ad2 |
| children | b69102c57df8 |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 19 23:06:15 2003 +0000 +++ b/src/ChangeLog Sun Jan 19 23:06:42 2003 +0000 @@ -1,3 +1,8 @@ +2003-01-20 Jan D. <jan.h.d@swipnet.se> + + * gtkutil.c (xg_create_frame_widgets): Check if there is an + external tool bar before setting tool bar height. + 2003-01-19 Jan D. <jan.h.d@swipnet.se> * xterm.c (handle_one_xevent): Surround popup_activated
--- a/src/xterm.c Sun Jan 19 23:06:15 2003 +0000 +++ b/src/xterm.c Sun Jan 19 23:06:42 2003 +0000 @@ -10692,9 +10692,11 @@ 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 @@ 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); } }