Mercurial > hg > xemacs-beta

comparison src/objects-x-impl.h @ 4909:87175eb65ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix xft compile error -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * objects-gtk-impl.h: * objects-gtk-impl.h (XCOLOR_INSTANCE_GTK_COLOR): * objects-gtk-impl.h (XFONT_INSTANCE_GTK_FONT): * objects-x-impl.h (XCOLOR_INSTANCE_X_COLOR): * objects-x-impl.h (XFONT_INSTANCE_X_FONT): Define XCOLOR_INSTANCE_X_COLOR, XCOLOR_INSTANCE_GTK_COLOR, XFONT_INSTANCE_X_FONT, XFONT_INSTANCE_GTK_FONT for convenience purposes. Fixes compile bug in redisplay-xlike-inc.c.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 06:20:05 -0600
parents ad2f4ae9895b
children a6c778975d7d
comparison
equal deleted inserted replaced
4908:b3ce27ca7647 4909:87175eb65ff4
51 char dealloc_on_gc; 51 char dealloc_on_gc;
52 }; 52 };
53 53
54 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data) 54 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data)
55 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color) 55 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color)
56 #define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c))
56 #ifdef USE_XFT 57 #ifdef USE_XFT
57 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor) 58 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor)
58 #endif 59 #endif
59 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc) 60 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc)
60 61
75 76
76 }; 77 };
77 78
78 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data) 79 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data)
79 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font) 80 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font)
81 #define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c))
80 #ifdef USE_XFT 82 #ifdef USE_XFT
81 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont) 83 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont)
82 #endif 84 #endif
83 85
84 #endif /* HAVE_X_WINDOWS */ 86 #endif /* HAVE_X_WINDOWS */