# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265026805 21600
# Node ID 87175eb65ff4a60fc7bb89ecd9e690f9e034c6b9
# Parent  b3ce27ca7647f2d9941e4b97f23a1ae338ae58b1
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.

diff -r b3ce27ca7647 -r 87175eb65ff4 src/ChangeLog
--- a/src/ChangeLog	Mon Feb 01 02:15:28 2010 -0600
+++ b/src/ChangeLog	Mon Feb 01 06:20:05 2010 -0600
@@ -1,3 +1,14 @@
+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.
+
 2010-02-01  Ben Wing  <ben@xemacs.org>
 
 	* compiler.h:
diff -r b3ce27ca7647 -r 87175eb65ff4 src/objects-gtk-impl.h
--- a/src/objects-gtk-impl.h	Mon Feb 01 02:15:28 2010 -0600
+++ b/src/objects-gtk-impl.h	Mon Feb 01 06:20:05 2010 -0600
@@ -43,6 +43,7 @@
 
 #define GTK_COLOR_INSTANCE_DATA(c) ((struct gtk_color_instance_data *) (c)->data)
 #define COLOR_INSTANCE_GTK_COLOR(c) (GTK_COLOR_INSTANCE_DATA (c)->color)
+#define XCOLOR_INSTANCE_GTK_COLOR(c) COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (c))
 #define COLOR_INSTANCE_GTK_DEALLOC(c) (GTK_COLOR_INSTANCE_DATA (c)->dealloc_on_gc)
 
 /*****************************************************************************
@@ -57,6 +58,7 @@
 
 #define GTK_FONT_INSTANCE_DATA(f) ((struct gtk_font_instance_data *) (f)->data)
 #define FONT_INSTANCE_GTK_FONT(f) (GTK_FONT_INSTANCE_DATA (f)->font)
+#define XFONT_INSTANCE_GTK_FONT(c) FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (c))
 
 #endif /* HAVE_GTK */
 #endif /* _XEMACS_OBJECTS_GTK_IMPL_H_ */
diff -r b3ce27ca7647 -r 87175eb65ff4 src/objects-x-impl.h
--- 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