projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.46 "Urania".
[chise/xemacs-chise.git]
/
src
/
glyphs.c
diff --git
a/src/glyphs.c
b/src/glyphs.c
index
73afa1b
..
4494fc8
100644
(file)
--- a/
src/glyphs.c
+++ b/
src/glyphs.c
@@
-46,7
+46,7
@@
Boston, MA 02111-1307, USA. */
#include "specifier.h"
#include "window.h"
#include "specifier.h"
#include "window.h"
-#ifdef HAVE_XPM
+#if defined (HAVE_XPM) && !defined (HAVE_GTK)
#include <X11/xpm.h>
#endif
#include <X11/xpm.h>
#endif
@@
-1004,7
+1004,7
@@
print_image_instance (Lisp_Object obj, Lisp_Object printcharfun,
print_internal
(IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0);
}
print_internal
(IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0);
}
-
+ /* fallthrough */
case IMAGE_SUBWINDOW:
sprintf (buf, " %dx%d", IMAGE_INSTANCE_WIDTH (ii),
case IMAGE_SUBWINDOW:
sprintf (buf, " %dx%d", IMAGE_INSTANCE_WIDTH (ii),
@@
-2811,6
+2811,14
@@
xface_possible_dest_types (void)
* XPM *
**********************************************************************/
* 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)
{
Lisp_Object
pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
{
@@
-2892,6
+2900,7
@@
pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid)
return Qnil; /* not reached */
}
return Qnil; /* not reached */
}
+#endif /* !HAVE_GTK */
static void
check_valid_xpm_color_symbols (Lisp_Object data)
static void
check_valid_xpm_color_symbols (Lisp_Object data)