Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 418:e804706bfb8c r21-2-17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-17
author cvs
date Mon, 13 Aug 2007 11:23:13 +0200
parents 697ef44129c6
children 41dbb7a9d5f2
comparison
equal deleted inserted replaced
417:43a18b32d56e 418:e804706bfb8c
598 598
599 case IMAGE_WIDGET: 599 case IMAGE_WIDGET:
600 markobj (IMAGE_INSTANCE_WIDGET_TYPE (i)); 600 markobj (IMAGE_INSTANCE_WIDGET_TYPE (i));
601 markobj (IMAGE_INSTANCE_WIDGET_PROPS (i)); 601 markobj (IMAGE_INSTANCE_WIDGET_PROPS (i));
602 markobj (IMAGE_INSTANCE_WIDGET_FACE (i)); 602 markobj (IMAGE_INSTANCE_WIDGET_FACE (i));
603 mark_gui_item (&IMAGE_INSTANCE_WIDGET_ITEM (i), markobj); 603 markobj (IMAGE_INSTANCE_WIDGET_ITEM (i));
604 case IMAGE_SUBWINDOW: 604 case IMAGE_SUBWINDOW:
605 markobj (IMAGE_INSTANCE_SUBWINDOW_FRAME (i)); 605 markobj (IMAGE_INSTANCE_SUBWINDOW_FRAME (i));
606 break; 606 break;
607 607
608 default: 608 default:
705 write_c_string (")", printcharfun); 705 write_c_string (")", printcharfun);
706 } 706 }
707 break; 707 break;
708 708
709 case IMAGE_WIDGET: 709 case IMAGE_WIDGET:
710 /*
710 if (!NILP (IMAGE_INSTANCE_WIDGET_CALLBACK (ii))) 711 if (!NILP (IMAGE_INSTANCE_WIDGET_CALLBACK (ii)))
711 { 712 {
712 print_internal (IMAGE_INSTANCE_WIDGET_CALLBACK (ii), printcharfun, 0); 713 print_internal (IMAGE_INSTANCE_WIDGET_CALLBACK (ii), printcharfun, 0);
713 write_c_string (", ", printcharfun); 714 write_c_string (", ", printcharfun);
714 } 715 }
716 */
715 if (!NILP (IMAGE_INSTANCE_WIDGET_FACE (ii))) 717 if (!NILP (IMAGE_INSTANCE_WIDGET_FACE (ii)))
716 { 718 {
717 write_c_string (" (", printcharfun); 719 write_c_string (" (", printcharfun);
718 print_internal 720 print_internal
719 (IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0); 721 (IMAGE_INSTANCE_WIDGET_FACE (ii), printcharfun, 0);
832 return 0; 834 return 0;
833 break; 835 break;
834 836
835 case IMAGE_WIDGET: 837 case IMAGE_WIDGET:
836 if (!(EQ (IMAGE_INSTANCE_WIDGET_TYPE (i1), 838 if (!(EQ (IMAGE_INSTANCE_WIDGET_TYPE (i1),
837 IMAGE_INSTANCE_WIDGET_TYPE (i2)) && 839 IMAGE_INSTANCE_WIDGET_TYPE (i2))
838 EQ (IMAGE_INSTANCE_WIDGET_CALLBACK (i1), 840 && internal_equal (IMAGE_INSTANCE_WIDGET_ITEM (i1),
839 IMAGE_INSTANCE_WIDGET_CALLBACK (i2)) 841 IMAGE_INSTANCE_WIDGET_ITEM (i2),
842 depth + 1)
840 && internal_equal (IMAGE_INSTANCE_WIDGET_PROPS (i1), 843 && internal_equal (IMAGE_INSTANCE_WIDGET_PROPS (i1),
841 IMAGE_INSTANCE_WIDGET_PROPS (i2), 844 IMAGE_INSTANCE_WIDGET_PROPS (i2),
842 depth + 1) 845 depth + 1)
843 && internal_equal (IMAGE_INSTANCE_WIDGET_TEXT (i1), 846 ))
844 IMAGE_INSTANCE_WIDGET_TEXT (i2),
845 depth + 1)))
846 return 0; 847 return 0;
847 case IMAGE_SUBWINDOW: 848 case IMAGE_SUBWINDOW:
848 if (!(IMAGE_INSTANCE_SUBWINDOW_WIDTH (i1) == 849 if (!(IMAGE_INSTANCE_SUBWINDOW_WIDTH (i1) ==
849 IMAGE_INSTANCE_SUBWINDOW_WIDTH (i2) && 850 IMAGE_INSTANCE_SUBWINDOW_WIDTH (i2) &&
850 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (i1) == 851 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (i1) ==
890 891
891 case IMAGE_WIDGET: 892 case IMAGE_WIDGET:
892 hash = HASH4 (hash, 893 hash = HASH4 (hash,
893 internal_hash (IMAGE_INSTANCE_WIDGET_TYPE (i), depth + 1), 894 internal_hash (IMAGE_INSTANCE_WIDGET_TYPE (i), depth + 1),
894 internal_hash (IMAGE_INSTANCE_WIDGET_PROPS (i), depth + 1), 895 internal_hash (IMAGE_INSTANCE_WIDGET_PROPS (i), depth + 1),
895 internal_hash (IMAGE_INSTANCE_WIDGET_CALLBACK (i), depth + 1)); 896 internal_hash (IMAGE_INSTANCE_WIDGET_ITEM (i), depth + 1));
896 case IMAGE_SUBWINDOW: 897 case IMAGE_SUBWINDOW:
897 hash = HASH4 (hash, IMAGE_INSTANCE_SUBWINDOW_WIDTH (i), 898 hash = HASH4 (hash, IMAGE_INSTANCE_SUBWINDOW_WIDTH (i),
898 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (i), 899 IMAGE_INSTANCE_SUBWINDOW_HEIGHT (i),
899 (int) IMAGE_INSTANCE_SUBWINDOW_ID (i)); 900 (int) IMAGE_INSTANCE_SUBWINDOW_ID (i));
900 break; 901 break;