Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 869:a07667553efc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-07 13:34:48 by wmperry] Fix problem with uninitialized Pixel values in the toolbar structures.
author wmperry
date Fri, 07 Jun 2002 13:34:50 +0000
parents 804517e16990
children 79c6ff3eef26
comparison
equal deleted inserted replaced
868:48eed784e93a 869:a07667553efc
451 #if 0 /* this interferes with things. #### fix this right */ 451 #if 0 /* this interferes with things. #### fix this right */
452 def (Qminibuffer, XtNminibuffer); 452 def (Qminibuffer, XtNminibuffer);
453 def (Qunsplittable, XtNunsplittable); 453 def (Qunsplittable, XtNunsplittable);
454 #endif 454 #endif
455 defi(Qinternal_border_width, XtNinternalBorderWidth); 455 defi(Qinternal_border_width, XtNinternalBorderWidth);
456 #ifdef HAVE_TOOLBARS
457 def (Qtop_toolbar_shadow_color, XtNtopToolBarShadowColor);
458 def (Qbottom_toolbar_shadow_color, XtNbottomToolBarShadowColor);
459 def (Qbackground_toolbar_color, XtNbackgroundToolBarColor);
460 def (Qtop_toolbar_shadow_pixmap, XtNtopToolBarShadowPixmap);
461 def (Qbottom_toolbar_shadow_pixmap, XtNbottomToolBarShadowPixmap);
462 defi(Qtoolbar_shadow_thickness, XtNtoolBarShadowThickness);
463 #endif
464 def (Qscrollbar_placement, XtNscrollBarPlacement); 456 def (Qscrollbar_placement, XtNscrollBarPlacement);
465 defi(Qinter_line_space, XtNinterline); 457 defi(Qinter_line_space, XtNinterline);
466 /* font, foreground */ 458 /* font, foreground */
467 def (Qiconic, XtNiconic); 459 def (Qiconic, XtNiconic);
468 def (Qbar_cursor, XtNbarCursor); 460 def (Qbar_cursor, XtNbarCursor);
565 return make_int (w->core.border_width); 557 return make_int (w->core.border_width);
566 if (EQ (Qinternal_border_width, property)) 558 if (EQ (Qinternal_border_width, property))
567 return make_int (w->emacs_frame.internal_border_width); 559 return make_int (w->emacs_frame.internal_border_width);
568 if (EQ (Qborder_color, property)) 560 if (EQ (Qborder_color, property))
569 return color_to_string (gw, w->core.border_pixel); 561 return color_to_string (gw, w->core.border_pixel);
570 #ifdef HAVE_TOOLBARS
571 if (EQ (Qtop_toolbar_shadow_color, property))
572 return color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel);
573 if (EQ (Qbottom_toolbar_shadow_color, property))
574 return color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel);
575 if (EQ (Qbackground_toolbar_color, property))
576 return color_to_string (gw, w->emacs_frame.background_toolbar_pixel);
577 if (EQ (Qtoolbar_shadow_thickness, property))
578 return make_int (w->emacs_frame.toolbar_shadow_thickness);
579 #endif /* HAVE_TOOLBARS */
580 if (EQ (Qinter_line_space, property)) 562 if (EQ (Qinter_line_space, property))
581 return make_int (w->emacs_frame.interline); 563 return make_int (w->emacs_frame.interline);
582 if (EQ (Qwindow_id, property)) 564 if (EQ (Qwindow_id, property))
583 return Fx_window_id (wrap_frame (f)); 565 return Fx_window_id (wrap_frame (f));
584 566
591 return EQ (property, Qleft) 573 return EQ (property, Qleft)
592 || EQ (property, Qtop) 574 || EQ (property, Qtop)
593 || EQ (property, Qborder_width) 575 || EQ (property, Qborder_width)
594 || EQ (property, Qinternal_border_width) 576 || EQ (property, Qinternal_border_width)
595 || EQ (property, Qborder_color) 577 || EQ (property, Qborder_color)
596 #ifdef HAVE_TOOLBARS
597 || EQ (property, Qtop_toolbar_shadow_color)
598 || EQ (property, Qbottom_toolbar_shadow_color)
599 || EQ (property, Qbackground_toolbar_color)
600 || EQ (property, Qtoolbar_shadow_thickness)
601 #endif /* HAVE_TOOLBARS */
602 || EQ (property, Qinter_line_space) 578 || EQ (property, Qinter_line_space)
603 || EQ (property, Qwindow_id) 579 || EQ (property, Qwindow_id)
604 || STRINGP (property); 580 || STRINGP (property);
605 } 581 }
606 582
613 Widget gw = (Widget) w; 589 Widget gw = (Widget) w;
614 Position x, y; 590 Position x, y;
615 591
616 props = cons3 (Qwindow_id, Fx_window_id (wrap_frame (f)), props); 592 props = cons3 (Qwindow_id, Fx_window_id (wrap_frame (f)), props);
617 props = cons3 (Qinter_line_space, make_int (w->emacs_frame.interline), props); 593 props = cons3 (Qinter_line_space, make_int (w->emacs_frame.interline), props);
618
619 #ifdef HAVE_TOOLBARS
620 props = cons3 (Qtoolbar_shadow_thickness,
621 make_int (w->emacs_frame.toolbar_shadow_thickness),
622 props);
623 props = cons3 (Qbackground_toolbar_color,
624 color_to_string (gw, w->emacs_frame.background_toolbar_pixel),
625 props);
626 props = cons3 (Qbottom_toolbar_shadow_color,
627 color_to_string (gw, w->emacs_frame.bottom_toolbar_shadow_pixel),
628 props);
629 props = cons3 (Qtop_toolbar_shadow_color,
630 color_to_string (gw, w->emacs_frame.top_toolbar_shadow_pixel),
631 props);
632 #endif /* HAVE_TOOLBARS */
633 594
634 props = cons3 (Qborder_color, 595 props = cons3 (Qborder_color,
635 color_to_string (gw, w->core.border_pixel), props); 596 color_to_string (gw, w->core.border_pixel), props);
636 props = cons3 (Qinternal_border_width, 597 props = cons3 (Qinternal_border_width,
637 make_int (w->emacs_frame.internal_border_width), props); 598 make_int (w->emacs_frame.internal_border_width), props);