Mercurial > hg > xemacs-beta
comparison src/glyphs-gtk.c @ 4962:e813cf16c015
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 05:29:05 -0600 |
parents | 304aebb79cd3 b3ce27ca7647 |
children | 16112448d484 4aebb0131297 |
comparison
equal
deleted
inserted
replaced
4961:b90f8cf474e0 | 4962:e813cf16c015 |
---|---|
2953 | 2953 |
2954 #undef BUILD_GLYPH_INST | 2954 #undef BUILD_GLYPH_INST |
2955 } | 2955 } |
2956 | 2956 |
2957 /* X specific crap */ | 2957 /* X specific crap */ |
2958 #include <gdk/gdkx.h> | 2958 #include "sysgdkx.h" |
2959 /* #### Should remove all this X specific stuff when GTK/GDK matures a | 2959 /* #### Should remove all this X specific stuff when GTK/GDK matures a |
2960 bit more and provides an abstraction for it. */ | 2960 bit more and provides an abstraction for it. */ |
2961 static int | 2961 static int |
2962 gtk_colorize_image_instance (Lisp_Object image_instance, | 2962 gtk_colorize_image_instance (Lisp_Object image_instance, |
2963 Lisp_Object foreground, Lisp_Object background) | 2963 Lisp_Object foreground, Lisp_Object background) |