kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

menu: Fixed wrong internal variable name. 

It should be 'it' not 'subitem'. It was wrong and confusing.
This commit is contained in:
Daniel Juyung Seo 2014-02-10 22:41:10 +09:00
parent 0fb094063b
commit 9ec7fd7dec
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
legacy/elementary/src/lib/elm_menu.c
View File

@ -967,7 +967,7 @@ _item_add(Eo *obj, void *_pd, va_list *list)
Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
*ret = NULL;
Elm_Menu_Item *subitem;
Elm_Menu_Item *it;
Evas_Object *icon_obj;
Elm_Menu_Smart_Data *sd = _pd;
@ -975,41 +975,41 @@ _item_add(Eo *obj, void *_pd, va_list *list)
icon_obj = elm_icon_add(obj);
if (!icon_obj) return;
subitem = elm_widget_item_new(obj, Elm_Menu_Item);
if (!subitem)
it = elm_widget_item_new(obj, Elm_Menu_Item);
if (!it)
{
evas_object_del(icon_obj);
return;
}
elm_widget_item_del_pre_hook_set(subitem, _item_del_pre_hook);
elm_widget_item_disable_hook_set(subitem, _item_disable_hook);
elm_widget_item_text_set_hook_set(subitem, _item_text_set_hook);
elm_widget_item_text_get_hook_set(subitem, _item_text_get_hook);
elm_widget_item_content_set_hook_set(subitem, _item_content_set_hook);
elm_widget_item_content_get_hook_set(subitem, _item_content_get_hook);
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
elm_widget_item_disable_hook_set(it, _item_disable_hook);
elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
subitem->base.data = data;
subitem->func = func;
subitem->parent = (Elm_Menu_Item *)parent;
subitem->content = icon_obj;
it->base.data = data;
it->func = func;
it->parent = (Elm_Menu_Item *)parent;
it->content = icon_obj;
_item_obj_create(subitem);
elm_object_item_text_set((Elm_Object_Item *)subitem, label);
_item_obj_create(it);
elm_object_item_text_set((Elm_Object_Item *)it, label);
elm_layout_content_set(VIEW(subitem), "elm.swallow.content",
subitem->content);
elm_layout_content_set(VIEW(it), "elm.swallow.content",
it->content);
if (icon) elm_menu_item_icon_name_set((Elm_Object_Item *)subitem, icon);
if (icon) elm_menu_item_icon_name_set((Elm_Object_Item *)it, icon);
_elm_menu_item_add_helper(obj, (Elm_Menu_Item *)parent, subitem, sd);
_elm_menu_item_add_helper(obj, (Elm_Menu_Item *)parent, it, sd);
if (sd->dbus_menu)
{
subitem->dbus_idx = _elm_dbus_menu_item_add(sd->dbus_menu, (Elm_Object_Item *)subitem);
subitem->dbus_menu = sd->dbus_menu;
it->dbus_idx = _elm_dbus_menu_item_add(sd->dbus_menu, (Elm_Object_Item *)it);
it->dbus_menu = sd->dbus_menu;
}
*ret = (Elm_Object_Item *)subitem;
*ret = (Elm_Object_Item *)it;
}
EAPI unsigned int