Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 462:0784d089fdc9 r21-2-46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-46
author cvs
date Mon, 13 Aug 2007 11:44:37 +0200
parents d7a9135ec789
children 183866b06e0b
comparison
equal deleted inserted replaced
461:120ed4009e51 462:0784d089fdc9
44 #include "rangetab.h" 44 #include "rangetab.h"
45 #include "redisplay.h" 45 #include "redisplay.h"
46 #include "specifier.h" 46 #include "specifier.h"
47 #include "window.h" 47 #include "window.h"
48 48
49 #ifdef HAVE_XPM 49 #if defined (HAVE_XPM) && !defined (HAVE_GTK)
50 #include <X11/xpm.h> 50 #include <X11/xpm.h>
51 #endif 51 #endif
52 52
53 Lisp_Object Qimage_conversion_error; 53 Lisp_Object Qimage_conversion_error;
54 54
2809 2809
2810 /********************************************************************** 2810 /**********************************************************************
2811 * XPM * 2811 * XPM *
2812 **********************************************************************/ 2812 **********************************************************************/
2813 2813
2814 #ifdef HAVE_GTK
2815 /* Gtk has to be gratuitously different, eh? */
2816 Lisp_Object
2817 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
2818 {
2819 return (make_string_from_file (name));
2820 }
2821 #else
2814 Lisp_Object 2822 Lisp_Object
2815 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) 2823 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
2816 { 2824 {
2817 char **data; 2825 char **data;
2818 int result; 2826 int result;
2890 } 2898 }
2891 } 2899 }
2892 2900
2893 return Qnil; /* not reached */ 2901 return Qnil; /* not reached */
2894 } 2902 }
2903 #endif /* !HAVE_GTK */
2895 2904
2896 static void 2905 static void
2897 check_valid_xpm_color_symbols (Lisp_Object data) 2906 check_valid_xpm_color_symbols (Lisp_Object data)
2898 { 2907 {
2899 Lisp_Object rest; 2908 Lisp_Object rest;