*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 428a9ca6ae6025e269b7e3fa7563ec08b8b366db..295609135a09561ebb8c4321e63b4ed26b3f61ee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/xterm.c b/src/xterm.c
index 348355d2b5bd2b907112139ee4968944ed563c24..080439004685faead37c47a0f0b15eed97a8a8b4 100644 (file)
--- 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);
                 }
           }