comparison src/graphics.cc @ 7403:135c13496faf

[project @ 2008-01-19 06:06:46 by jwe]
author jwe
date Sat, 19 Jan 2008 06:10:33 +0000
parents a78c7bccda91
children 246f905cb984
comparison
equal deleted inserted replaced
7402:bd58dafaf102 7403:135c13496faf
680 { 680 {
681 iterator p = handle_map.find (h); 681 iterator p = handle_map.find (h);
682 682
683 if (p != handle_map.end ()) 683 if (p != handle_map.end ())
684 { 684 {
685 p->second.get_properties ().execute_deletefcn (); 685 p->second.get_properties ().set_beingdeleted (true);
686 p->second.get_properties ().execute_deletefcn ();
686 687
687 handle_map.erase (p); 688 handle_map.erase (p);
688 689
689 if (h.value () < 0) 690 if (h.value () < 0)
690 handle_free_list.insert (h); 691 handle_free_list.insert (h);
938 retval = get_uicontextmenu (); 939 retval = get_uicontextmenu ();
939 else if (name.compare ("userdata")) 940 else if (name.compare ("userdata"))
940 retval = get_userdata (); 941 retval = get_userdata ();
941 else if (name.compare ("visible")) 942 else if (name.compare ("visible"))
942 retval = get_visible (); 943 retval = get_visible ();
944 else if (name.compare ("beingdeleted"))
945 retval = get_beingdeleted ();
943 else 946 else
944 { 947 {
945 std::map<caseless_str, property>::const_iterator it = all_props.find (name); 948 std::map<caseless_str, property>::const_iterator it = all_props.find (name);
946 949
947 if (it != all_props.end ()) 950 if (it != all_props.end ())
980 m.assign ("selected", get_selected ()); 983 m.assign ("selected", get_selected ());
981 m.assign ("selectionhighlight", get_selectionhighlight ()); 984 m.assign ("selectionhighlight", get_selectionhighlight ());
982 m.assign ("uicontextmenu", get_uicontextmenu ()); 985 m.assign ("uicontextmenu", get_uicontextmenu ());
983 m.assign ("userdata", get_userdata ()); 986 m.assign ("userdata", get_userdata ());
984 m.assign ("visible", get_visible ()); 987 m.assign ("visible", get_visible ());
988 m.assign ("beingdeleted", get_beingdeleted ());
985 989
986 return m; 990 return m;
987 } 991 }
988 992
989 void 993 void