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

Revert "efl_ui_widget: resolve warning about multiple defines" 

This reverts commit 9012742f9a.

I landed this too hastily.
This commit is contained in:
Xavi Artigas 2019-03-19 16:50:13 +01:00
parent 9012742f9a
commit 8c39c0e251
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,6 +481,11 @@ _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)) if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
{ {
ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
if (!logical_wd)
{
ERR("Widget parent has the wrong type!");
return NULL;
}
logical_wd->logical.child_count --; logical_wd->logical.child_count --;
} }
old = pd->logical.parent; old = pd->logical.parent;
@ -492,6 +497,11 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
if (efl_isa(parent, EFL_UI_WIDGET_CLASS)) if (efl_isa(parent, EFL_UI_WIDGET_CLASS))
{ {
ELM_WIDGET_DATA_GET(parent, parent_wd); ELM_WIDGET_DATA_GET(parent, parent_wd);
if (!parent_wd)
{
ERR("Widget parent has the wrong type!");
return NULL;
}
parent_wd->logical.child_count ++; parent_wd->logical.child_count ++;
} }
pd->logical.parent = parent; pd->logical.parent = parent;