X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fglyphs-gtk.c;h=69e59e1d3a1746587a8fcd9fc6f5aa7f75002d5f;hp=ce6e3450215e9778186a49748977021e250a3746;hb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;hpb=ccce6217f84987dff10ed3d2b60b9f0f65d8f25a

diff --git a/src/glyphs-gtk.c b/src/glyphs-gtk.c
index ce6e345..69e59e1 100644
--- a/src/glyphs-gtk.c
+++ b/src/glyphs-gtk.c
@@ -1576,13 +1576,15 @@ gtk_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 
   type = resource_symbol_to_type (resource_type);
 
-  //   if (dest_mask & IMAGE_POINTER_MASK && type == IMAGE_POINTER_MASK)
-  //     iitype = IMAGE_POINTER;
-  //   else if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
-  //     iitype = IMAGE_COLOR_PIXMAP;
-  //   else 
-  //     incompatible_image_types (instantiator, dest_mask,
-  // 			      IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
+#if 0
+  if (dest_mask & IMAGE_POINTER_MASK && type == IMAGE_POINTER_MASK)
+    iitype = IMAGE_POINTER;
+  else if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
+    iitype = IMAGE_COLOR_PIXMAP;
+  else 
+    incompatible_image_types (instantiator, dest_mask,
+			      IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
+#endif
 
   /* mess with the keyword info we were provided with */
   gtk_initialize_pixmap_image_instance (ii, 1, type);