* 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 aa3721d91068055372cf87fdaea06e08edd06817..fd12877d2ce0e34544e4ecb08b7dd598f12354f9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27  Jan Dj\e,Ad\e(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 3ffba0ba745e1a0b4c848f67da418d841d4843aa..fabdae74dc6fbd19022288d41d8a281262c3e544 100644 (file)
--- 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;