rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't leak when setting an icon on a button that already has one 

don't leave stale subobjects when setting a button's icon to NULL


SVN revision: 29206
This commit is contained in:
rephorm 2007-03-28 05:50:43 +00:00 committed by rephorm
parent cc01d54945
commit 0cf67a84aa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_widget_button.c
View File

@ -86,15 +86,17 @@ e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon)
E_Widget_Data *wd; E_Widget_Data *wd;
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
if (!icon) if (wd->o_icon)
{ {
e_widget_sub_object_del(obj, wd->o_icon);
evas_object_hide(wd->o_icon); evas_object_hide(wd->o_icon);
edje_object_signal_emit(wd->o_button, "e,action,hide,icon", "e"); edje_object_signal_emit(wd->o_button, "e,action,hide,icon", "e");
edje_object_message_signal_process(wd->o_button); edje_object_message_signal_process(wd->o_button);
edje_object_part_unswallow(wd->o_button, wd->o_icon); edje_object_part_unswallow(wd->o_button, wd->o_icon);
evas_object_del(wd->o_icon); evas_object_del(wd->o_icon);
wd->o_icon = NULL;
} }
else if (icon)
{ {
wd->o_icon = icon; wd->o_icon = icon;
edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon); edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);