From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 3 Dec 2013 18:08:14 +0000 (+0100)
Subject: Add to last fix: In gtk resizing count tool and menubars.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~570
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b254a38fa0c852d1f7297e31b811f0d2962c81d;p=emacs.git

Add to last fix: In gtk resizing count tool and menubars.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 4ecdd18aeb2..ef422989c61 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -952,7 +952,9 @@ xg_frame_set_char_size (struct frame *f, int width, int height)
   /* Must resize our top level widget.  Font size may have changed,
      but not rows/cols.  */
   gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                     pixelwidth, pixelheight);
+                     pixelwidth + FRAME_TOOLBAR_WIDTH (f),
+		     pixelheight + FRAME_TOOLBAR_HEIGHT (f)
+		     + FRAME_MENUBAR_HEIGHT (f));
   x_wm_set_size_hint (f, 0, 0);
 
   SET_FRAME_GARBAGED (f);