enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl_ui_widget: resolve warning about multiple defines 

Summary:
the difference here is, that the macro before did not print ERR's the
one now does. Hence this commit remove two error messages.

Reviewers: devilhorns

Reviewed By: devilhorns

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8415
This commit is contained in:
Marcel Hollerbach 2019-03-19 16:28:10 -04:00 committed by Christopher Michael
parent f4b138d5be
commit bb0290edbe
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/elementary/efl_ui_widget.c
View File

@ -480,12 +480,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
{
if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
{
ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
if (!logical_wd)
{
ERR("Widget parent has the wrong type!");
return NULL;
}
ELM_WIDGET_DATA_GET_OR_RETURN(pd->logical.parent, logical_wd, NULL);
logical_wd->logical.child_count --;
}
old = pd->logical.parent;
@ -496,12 +491,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
{
if (efl_isa(parent, EFL_UI_WIDGET_CLASS))
{
ELM_WIDGET_DATA_GET(parent, parent_wd);
if (!parent_wd)
{
ERR("Widget parent has the wrong type!");
return NULL;
}
ELM_WIDGET_DATA_GET_OR_RETURN(parent, parent_wd, NULL);
parent_wd->logical.child_count ++;
}
pd->logical.parent = parent;