1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-02 18:21:19 -08:00

Fix last fix (Bug#16036)

This commit is contained in:
Martin Rudalics 2013-12-03 12:33:13 +01:00
parent d6f2380eee
commit 4525072b21

View file

@ -8638,20 +8638,18 @@ x_set_window_size (struct frame *f, int change_gravity, int width, int height, b
change_frame_size (f, text_width, text_height, 0, 1, 0, 1);
}
if (! pixelwise)
{
width = width * FRAME_COLUMN_WIDTH (f);
height = height * FRAME_LINE_HEIGHT (f);
}
#ifdef USE_GTK
if (FRAME_GTK_WIDGET (f))
xg_frame_set_char_size (f, width, height);
if (! pixelwise)
xg_frame_set_char_size (f, width * FRAME_COLUMN_WIDTH (f),
height * FRAME_LINE_HEIGHT (f));
else
xg_frame_set_char_size (f, width, height);
else
x_set_window_size_1 (f, change_gravity, width, height, 1);
x_set_window_size_1 (f, change_gravity, width, height, pixelwise);
#else /* not USE_GTK */
x_set_window_size_1 (f, change_gravity, width, height, 1);
x_set_window_size_1 (f, change_gravity, width, height, pixelwise);
#endif /* not USE_GTK */