From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 3 Dec 2013 17:22:05 +0000 (+0100)
Subject: Again fix last fix.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bab5c317ae3d099c84ec79ea4bfb0d880cccea37;p=emacs.git

Again fix last fix.
---

diff --git a/src/xfns.c b/src/xfns.c
index 2222eee6097..3c8df12f8c5 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3069,6 +3069,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
      happen.  */
   init_frame_faces (f);
 
+#ifdef USE_GTK
   /* PXW: This is a duplicate from below.  We have to do it here since
      otherwise x_set_tool_bar_lines will work with the character sizes
      installed by init_frame_faces while the frame's pixel size is still
@@ -3082,6 +3083,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   FRAME_TEXT_HEIGHT (f) = 0;
   SET_FRAME_WIDTH (f, 0);
   change_frame_size (f, width, height, 1, 0, 0, 1);
+#endif /* USE_GTK */
 
   /* Set the menu-bar-lines and tool-bar-lines parameters.  We don't
      look up the X resources controlling the menu-bar and tool-bar