Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/src/objects-x-impl.h	Mon Feb 01 02:15:28 2010 -0600
+++ b/src/objects-x-impl.h	Mon Feb 01 06:20:05 2010 -0600
@@ -53,6 +53,7 @@
 
 #define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data)
 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color)
+#define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c))
 #ifdef USE_XFT
 #define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor)
 #endif
@@ -77,6 +78,7 @@
 
 #define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data)
 #define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font)
+#define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c))
 #ifdef USE_XFT
 #define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont)
 #endif