From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 27 Aug 2004 16:50:02 +0000 (+0000)
Subject: * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
X-Git-Tag: ttn-vms-21-2-B4~5172
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5500be54e134938c0fd50c6a629fc7b7f84d9d21;p=emacs.git

* gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
  tool bar items is 0.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index aa3721d9106..fd12877d2ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
+	tool bar items is 0.
+
 2004-08-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3ffba0ba745..fabdae74dc6 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -793,7 +793,7 @@ xg_create_frame_widgets (f)
      up in the wrong place as tool bar height has not been taken into account.
      So we cheat a bit by setting a height that is what it will have
      later on when tool bar items are added.  */
-  if (FRAME_EXTERNAL_TOOL_BAR (f) && FRAME_TOOLBAR_HEIGHT (f) == 0)
+  if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0)
     FRAME_TOOLBAR_HEIGHT (f) = 34;