Mercurial > hg > xemacs-beta
diff src/glyphs.c @ 462:0784d089fdc9 r21-2-46
Import from CVS: tag r21-2-46
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:44:37 +0200 |
| parents | d7a9135ec789 |
| children | 183866b06e0b |
line wrap: on
line diff
--- a/src/glyphs.c Mon Aug 13 11:43:25 2007 +0200 +++ b/src/glyphs.c Mon Aug 13 11:44:37 2007 +0200 @@ -46,7 +46,7 @@ #include "specifier.h" #include "window.h" -#ifdef HAVE_XPM +#if defined (HAVE_XPM) && !defined (HAVE_GTK) #include <X11/xpm.h> #endif @@ -2811,6 +2811,14 @@ * XPM * **********************************************************************/ +#ifdef HAVE_GTK +/* Gtk has to be gratuitously different, eh? */ +Lisp_Object +pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) +{ + return (make_string_from_file (name)); +} +#else Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) { @@ -2892,6 +2900,7 @@ return Qnil; /* not reached */ } +#endif /* !HAVE_GTK */ static void check_valid_xpm_color_symbols (Lisp_Object data)