(x_set_window_size): Add USE_X_TOOLKIT conditional. Call EmacsFrameSetCharSize and...

diff --git a/src/xterm.c b/src/xterm.c
index 7623018ee7036b27d339ed5d9579cc2bbebc8c77..e471311da5a7a8f83925d1cae761a528aecdb8f3 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4521,6 +4521,13 @@ x_set_window_size (f, cols, rows)
   int pixelwidth, pixelheight;
   int mask;
 
+#ifdef USE_X_TOOLKIT
+  BLOCK_INPUT;
+  EmacsFrameSetCharSize (f->display.x->edit_widget, cols, rows);
+  UNBLOCK_INPUT;
+
+#else /* not USE_X_TOOLKIT */
+
   BLOCK_INPUT;
 
   check_frame_size (f, &rows, &cols);
@@ -4531,11 +4538,6 @@ x_set_window_size (f, cols, rows)
   pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols);
   pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows);
 
-#if 0
-#ifdef USE_X_TOOLKIT
-  EmacsFrameSetCharSize (f->display.x->edit_widget, cols, rows);
-#endif /* USE_X_TOOLKIT */
-#endif
 #ifdef HAVE_X11
   x_wm_set_size_hint (f, 0, 0, 0);
 #endif /* ! defined (HAVE_X11) */
@@ -4563,6 +4565,7 @@ x_set_window_size (f, cols, rows)
 
   XFlushQueue ();
   UNBLOCK_INPUT;
+#endif /* not USE_X_TOOLKIT */
 }
 
 #ifndef HAVE_X11