Mercurial > emacs

comparison src/window.c @ 15384:fcb239c22d04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fset_window_configuration) [HAVE_WINDOW_SYSTEM]: Call `x_set_menu_bar_lines' on MSDOS as well.
author Richard M. Stallman <rms@gnu.org>
date Mon, 10 Jun 1996 21:00:11 +0000
parents 00619dd2f972
children 72b57d1c8de0
comparison
equal deleted inserted replaced
15383:9a6c8d10ac5f 15384:fcb239c22d04
3084 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); 3084 int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
3085 3085
3086 if (XFASTINT (data->frame_height) != previous_frame_height 3086 if (XFASTINT (data->frame_height) != previous_frame_height
3087 || XFASTINT (data->frame_width) != previous_frame_width) 3087 || XFASTINT (data->frame_width) != previous_frame_width)
3088 change_frame_size (f, data->frame_height, data->frame_width, 0, 0); 3088 change_frame_size (f, data->frame_height, data->frame_width, 0, 0);
3089 #ifdef HAVE_WINDOW_SYSTEM 3089 #if defined(HAVE_WINDOW_SYSTEM) || (defined(MSDOS) && defined(MULTI_FRAME))
3090 if (XFASTINT (data->frame_menu_bar_lines) 3090 if (XFASTINT (data->frame_menu_bar_lines)
3091 != previous_frame_menu_bar_lines) 3091 != previous_frame_menu_bar_lines)
3092 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); 3092 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0);
3093 #endif 3093 #endif
3094 3094
3222 #endif 3222 #endif
3223 3223
3224 #if 0 /* I don't understand why this is needed, and it causes problems 3224 #if 0 /* I don't understand why this is needed, and it causes problems
3225 when the frame's old selected window has been deleted. */ 3225 when the frame's old selected window has been deleted. */
3226 #ifdef MULTI_FRAME 3226 #ifdef MULTI_FRAME
3227 if (f != selected_frame && ! FRAME_TERMCAP_P (f)) 3227 if (f != selected_frame && ! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f))
3228 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), 3228 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
3229 Qnil, 0); 3229 Qnil, 0);
3230 #endif 3230 #endif
3231 #endif 3231 #endif
3232 3232
3233 /* Set the screen height to the value it had before this function. */ 3233 /* Set the screen height to the value it had before this function. */
3234 if (previous_frame_height != FRAME_HEIGHT (f) 3234 if (previous_frame_height != FRAME_HEIGHT (f)
3235 || previous_frame_width != FRAME_WIDTH (f)) 3235 || previous_frame_width != FRAME_WIDTH (f))
3236 change_frame_size (f, previous_frame_height, previous_frame_width, 3236 change_frame_size (f, previous_frame_height, previous_frame_width,
3237 0, 0); 3237 0, 0);
3238 #ifdef HAVE_WINDOW_SYSTEM 3238 #if defined(HAVE_WINDOW_SYSTEM) || (defined(MSDOS) && defined(MULTI_FRAME))
3239 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 3239 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
3240 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0); 3240 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0);
3241 #endif 3241 #endif
3242 } 3242 }
3243 3243