rebase/elm_widget: Fix conflict created by rebasing

Change-Id: I539d40ebdb78ff6b453ad4a22b54decbf2c29aa0
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>

diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 9cd24b8..9c045f4 100644 (file)
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -2950,32 +2950,6 @@ elm_widget_atspi(Evas_Object *obj, Eina_Bool is_atspi)
      {
         ret &= elm_widget_atspi(child, is_atspi);
      }
-   elm_obj_widget_atspi(obj, is_atspi);
-
-   return ret;
-}
-
-EOLIAN static void
-_elm_widget_atspi(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_atspi EINA_UNUSED)
-{
-}
-//
-//
-//
-
-EOLIAN static Elm_Theme*
-_elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
-{
-   Eina_List *l, *children;
-   Evas_Object *child;
-   Eina_Bool ret = EINA_TRUE;
-
-   API_ENTRY return EINA_FALSE;
-   children = efl_access_children_get(obj);
-   EINA_LIST_FOREACH(children, l, child)
-     {
-        ret &= elm_widget_atspi(child, is_atspi);
-     }
    efl_ui_widget_atspi(obj, is_atspi);
 
    return ret;
@@ -2987,7 +2961,6 @@ _elm_widget_atspi(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, E
 }
 //
 //
-//
 
 EAPI Elm_Theme *
 elm_widget_theme_get(const Evas_Object *obj)