Mercurial > hg > xemacs-beta

changeset 595:fec27b06b4e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-31 14:45:08 by wmperry] Remove C++ comments from this file. sorry!
author wmperry
date Thu, 31 May 2001 14:45:08 +0000
parents fd49b88b9f06
children cdb192350f65
files src/glyphs-gtk.c
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/glyphs-gtk.c	Thu May 31 12:47:28 2001 +0000
+++ b/src/glyphs-gtk.c	Thu May 31 14:45:08 2001 +0000
@@ -1546,14 +1546,16 @@
 
   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);
   c = gdk_cursor_new (resource_name_to_resource (resource_id, type));