Mercurial > emacs

diff src/dispnew.c @ 49322:2cbb0b823e83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK version
author Jan Djärv <jan.h.d@swipnet.se>
date Sun, 19 Jan 2003 21:50:03 +0000
parents 227785e3e29f
children 23a1cea22d13
line wrap: on
line diff
--- a/src/dispnew.c	Sun Jan 19 20:03:42 2003 +0000
+++ b/src/dispnew.c	Sun Jan 19 21:50:03 2003 +0000
@@ -2371,7 +2371,7 @@
 
   /* Allocate/ reallocate matrices of the dummy window used to display
      the menu bar under X when no X toolkit support is available.  */
-#ifndef USE_X_TOOLKIT
+#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
   {
     /* Allocate a dummy window if not already done.  */
     if (NILP (f->menu_bar_window))
@@ -2394,6 +2394,7 @@
   }
 #endif /* not USE_X_TOOLKIT */
 
+#ifndef USE_GTK
   /* Allocate/ reallocate matrices of the tool bar window.  If we
      don't have a tool bar window yet, make one.  */
   if (NILP (f->tool_bar_window))
@@ -2411,6 +2412,7 @@
   XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f));
   XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
   allocate_matrices_for_window_redisplay (w);
+#endif
 }