From 80fd1fe20c26a026a8d1dfbbb341413e522f76f4 Mon Sep 17 00:00:00 2001 From: Fred Pierresteguy Date: Fri, 28 Jan 1994 17:34:46 +0000 Subject: [PATCH] (x_set_window_size): Add USE_X_TOOLKIT conditional. Call EmacsFrameSetCharSize and return. --- src/xterm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 7623018ee70..e471311da5a 100644 --- 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 -- 2.39.5