Mercurial > hg > xemacs-beta

comparison src/EmacsFrame.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 d372b17f63ce
children 308d34e9f07d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
409 #endif /* HAVE_SCROLLBARS */ 409 #endif /* HAVE_SCROLLBARS */
410 #ifdef HAVE_TOOLBARS 410 #ifdef HAVE_TOOLBARS
411 if (cur->emacs_frame.top_toolbar_height != 411 if (cur->emacs_frame.top_toolbar_height !=
412 new_->emacs_frame.top_toolbar_height) 412 new_->emacs_frame.top_toolbar_height)
413 Fadd_spec_to_specifier 413 Fadd_spec_to_specifier
414 (Vtoolbar_size[TOP_TOOLBAR], 414 (Vtoolbar_size[TOP_EDGE],
415 make_int (new_->emacs_frame.top_toolbar_height), 415 make_int (new_->emacs_frame.top_toolbar_height),
416 wrap_frame (f), Qnil, Qnil); 416 wrap_frame (f), Qnil, Qnil);
417 if (cur->emacs_frame.bottom_toolbar_height != 417 if (cur->emacs_frame.bottom_toolbar_height !=
418 new_->emacs_frame.bottom_toolbar_height) 418 new_->emacs_frame.bottom_toolbar_height)
419 Fadd_spec_to_specifier 419 Fadd_spec_to_specifier
420 (Vtoolbar_size[BOTTOM_TOOLBAR], 420 (Vtoolbar_size[BOTTOM_EDGE],
421 make_int (new_->emacs_frame.bottom_toolbar_height), 421 make_int (new_->emacs_frame.bottom_toolbar_height),
422 wrap_frame (f), Qnil, Qnil); 422 wrap_frame (f), Qnil, Qnil);
423 if (cur->emacs_frame.left_toolbar_width != 423 if (cur->emacs_frame.left_toolbar_width !=
424 new_->emacs_frame.left_toolbar_width) 424 new_->emacs_frame.left_toolbar_width)
425 Fadd_spec_to_specifier 425 Fadd_spec_to_specifier
426 (Vtoolbar_size[LEFT_TOOLBAR], 426 (Vtoolbar_size[LEFT_EDGE],
427 make_int (new_->emacs_frame.left_toolbar_width), 427 make_int (new_->emacs_frame.left_toolbar_width),
428 wrap_frame (f), Qnil, Qnil); 428 wrap_frame (f), Qnil, Qnil);
429 if (cur->emacs_frame.right_toolbar_width != 429 if (cur->emacs_frame.right_toolbar_width !=
430 new_->emacs_frame.right_toolbar_width) 430 new_->emacs_frame.right_toolbar_width)
431 Fadd_spec_to_specifier 431 Fadd_spec_to_specifier
432 (Vtoolbar_size[RIGHT_TOOLBAR], 432 (Vtoolbar_size[RIGHT_EDGE],
433 make_int (new_->emacs_frame.right_toolbar_width), 433 make_int (new_->emacs_frame.right_toolbar_width),
434 wrap_frame (f), Qnil, Qnil); 434 wrap_frame (f), Qnil, Qnil);
435 if (cur->emacs_frame.top_toolbar_border_width != 435 if (cur->emacs_frame.top_toolbar_border_width !=
436 new_->emacs_frame.top_toolbar_border_width) 436 new_->emacs_frame.top_toolbar_border_width)
437 Fadd_spec_to_specifier 437 Fadd_spec_to_specifier
438 (Vtoolbar_border_width[TOP_TOOLBAR], 438 (Vtoolbar_border_width[TOP_EDGE],
439 make_int (new_->emacs_frame.top_toolbar_border_width), 439 make_int (new_->emacs_frame.top_toolbar_border_width),
440 wrap_frame (f), Qnil, Qnil); 440 wrap_frame (f), Qnil, Qnil);
441 if (cur->emacs_frame.bottom_toolbar_border_width != 441 if (cur->emacs_frame.bottom_toolbar_border_width !=
442 new_->emacs_frame.bottom_toolbar_border_width) 442 new_->emacs_frame.bottom_toolbar_border_width)
443 Fadd_spec_to_specifier 443 Fadd_spec_to_specifier
444 (Vtoolbar_border_width[BOTTOM_TOOLBAR], 444 (Vtoolbar_border_width[BOTTOM_EDGE],
445 make_int (new_->emacs_frame.bottom_toolbar_border_width), 445 make_int (new_->emacs_frame.bottom_toolbar_border_width),
446 wrap_frame (f), Qnil, Qnil); 446 wrap_frame (f), Qnil, Qnil);
447 if (cur->emacs_frame.left_toolbar_border_width != 447 if (cur->emacs_frame.left_toolbar_border_width !=
448 new_->emacs_frame.left_toolbar_border_width) 448 new_->emacs_frame.left_toolbar_border_width)
449 Fadd_spec_to_specifier 449 Fadd_spec_to_specifier
450 (Vtoolbar_border_width[LEFT_TOOLBAR], 450 (Vtoolbar_border_width[LEFT_EDGE],
451 make_int (new_->emacs_frame.left_toolbar_border_width), 451 make_int (new_->emacs_frame.left_toolbar_border_width),
452 wrap_frame (f), Qnil, Qnil); 452 wrap_frame (f), Qnil, Qnil);
453 if (cur->emacs_frame.right_toolbar_border_width != 453 if (cur->emacs_frame.right_toolbar_border_width !=
454 new_->emacs_frame.right_toolbar_border_width) 454 new_->emacs_frame.right_toolbar_border_width)
455 Fadd_spec_to_specifier 455 Fadd_spec_to_specifier
456 (Vtoolbar_border_width[RIGHT_TOOLBAR], 456 (Vtoolbar_border_width[RIGHT_EDGE],
457 make_int (new_->emacs_frame.right_toolbar_border_width), 457 make_int (new_->emacs_frame.right_toolbar_border_width),
458 wrap_frame (f), Qnil, Qnil); 458 wrap_frame (f), Qnil, Qnil);
459 #endif /* HAVE_TOOLBARS */ 459 #endif /* HAVE_TOOLBARS */
460 460
461 in_resource_setting--; 461 in_resource_setting--;