comparison src/objects.h @ 5140:e5380fdaf8f1

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 05:38:34 -0600
parents 7be849cb8828
children
comparison
equal deleted inserted replaced
5139:a48ef26d87ee 5140:e5380fdaf8f1
28 28
29 /**************************************************************************** 29 /****************************************************************************
30 * Color Instance Object * 30 * Color Instance Object *
31 ****************************************************************************/ 31 ****************************************************************************/
32 32
33 DECLARE_LRECORD (color_instance, Lisp_Color_Instance); 33 DECLARE_LISP_OBJECT (color_instance, Lisp_Color_Instance);
34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) 34 #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance)
35 #define wrap_color_instance(p) wrap_record (p, color_instance) 35 #define wrap_color_instance(p) wrap_record (p, color_instance)
36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) 36 #define COLOR_INSTANCEP(x) RECORDP (x, color_instance)
37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) 37 #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance)
38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) 38 #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance)
49 ****************************************************************************/ 49 ****************************************************************************/
50 50
51 void initialize_charset_font_caches (struct device *d); 51 void initialize_charset_font_caches (struct device *d);
52 void invalidate_charset_font_caches (Lisp_Object charset); 52 void invalidate_charset_font_caches (Lisp_Object charset);
53 53
54 DECLARE_LRECORD (font_instance, Lisp_Font_Instance); 54 DECLARE_LISP_OBJECT (font_instance, Lisp_Font_Instance);
55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) 55 #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance)
56 #define wrap_font_instance(p) wrap_record (p, font_instance) 56 #define wrap_font_instance(p) wrap_record (p, font_instance)
57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance) 57 #define FONT_INSTANCEP(x) RECORDP (x, font_instance)
58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) 58 #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance)
59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) 59 #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance)