Mercurial > emacs
changeset 5686:0c351de98a26
(x_set_window_size): Add USE_X_TOOLKIT conditional. Call EmacsFrameSetCharSize and return.
| author | Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr> |
|---|---|
| date | Fri, 28 Jan 1994 17:34:46 +0000 |
| parents | 07f5e3a0f905 |
| children | 2f22c0c6f021 |
| files | src/xterm.c |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Fri Jan 28 14:28:51 1994 +0000 +++ b/src/xterm.c Fri Jan 28 17:34:46 1994 +0000 @@ -4521,6 +4521,13 @@ 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 @@ 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 @@ XFlushQueue (); UNBLOCK_INPUT; +#endif /* not USE_X_TOOLKIT */ } #ifndef HAVE_X11