comparison src/glyphs.h @ 388:aabb7f5b1c81 r21-2-9

Import from CVS: tag r21-2-9
author cvs
date Mon, 13 Aug 2007 11:09:42 +0200
parents bbff43aa5eb7
children 6719134a07c2
comparison
equal deleted inserted replaced
387:f892a9d0bb8d 388:aabb7f5b1c81
618 #define XGLYPH_IMAGE(g) GLYPH_IMAGE (XGLYPH (g)) 618 #define XGLYPH_IMAGE(g) GLYPH_IMAGE (XGLYPH (g))
619 #define XGLYPH_CONTRIB_P(g) GLYPH_CONTRIB_P (XGLYPH (g)) 619 #define XGLYPH_CONTRIB_P(g) GLYPH_CONTRIB_P (XGLYPH (g))
620 #define XGLYPH_BASELINE(g) GLYPH_BASELINE (XGLYPH (g)) 620 #define XGLYPH_BASELINE(g) GLYPH_BASELINE (XGLYPH (g))
621 #define XGLYPH_FACE(g) GLYPH_FACE (XGLYPH (g)) 621 #define XGLYPH_FACE(g) GLYPH_FACE (XGLYPH (g))
622 622
623 extern Lisp_Object Qxpm; 623 extern Lisp_Object Qxpm, Qxface;
624 extern Lisp_Object Q_data, Q_file, Q_color_symbols, Qconst_glyph_variable; 624 extern Lisp_Object Q_data, Q_file, Q_color_symbols, Qconst_glyph_variable;
625 extern Lisp_Object Qxbm, Qedit, Qgroup, Qlabel, Qcombo, Qscrollbar; 625 extern Lisp_Object Qxbm, Qedit, Qgroup, Qlabel, Qcombo, Qscrollbar, Qprogress;
626 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y; 626 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y;
627 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group; 627 extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group;
628 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height; 628 extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text;
629 extern Lisp_Object Q_items, Q_properties, Qimage_conversion_error; 629 extern Lisp_Object Q_items, Q_properties, Q_image, Q_percent, Qimage_conversion_error;
630 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph; 630 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph;
631 extern Lisp_Object Vinvisible_text_glyph, Voctal_escape_glyph, Vtruncation_glyph; 631 extern Lisp_Object Vinvisible_text_glyph, Voctal_escape_glyph, Vtruncation_glyph;
632 extern Lisp_Object Vxemacs_logo; 632 extern Lisp_Object Vxemacs_logo;
633 633
634 unsigned short glyph_width (Lisp_Object glyph, Lisp_Object frame_face, 634 unsigned short glyph_width (Lisp_Object glyph, Lisp_Object frame_face,