elm_frame: porting evas smart callbacks to eo

diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 04f7402..d5ebc1f 100644 (file)
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -96,12 +96,13 @@ _elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd E
      }
 }
 
-static void
+static Eina_Bool
 _recalc(void *data,
-        Evas_Object *obj EINA_UNUSED,
-        void *event_info EINA_UNUSED)
+      Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    elm_layout_sizing_eval(data);
+
+   return EINA_TRUE;
 }
 
 static void
@@ -113,8 +114,8 @@ _on_recalc_done(void *data,
    ELM_FRAME_DATA_GET(data, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
 
-   evas_object_smart_callback_del
-     (wd->resize_obj, "recalc", _recalc);
+   eo_do(wd->resize_obj, eo_event_callback_del
+     (EDJE_OBJECT_EVENT_RECALC, _recalc, data));
    sd->anim = EINA_FALSE;
 
    elm_layout_sizing_eval(data);
@@ -133,13 +134,14 @@ _on_frame_clicked(void *data,
 
    if (sd->collapsible)
      {
-        evas_object_smart_callback_add
-          (wd->resize_obj, "recalc", _recalc, data);
+        eo_do(wd->resize_obj, eo_event_callback_add(
+          EDJE_OBJECT_EVENT_RECALC, _recalc, data));
         elm_layout_signal_emit(data, "elm,action,toggle", "elm");
         sd->collapsed++;
         sd->anim = EINA_TRUE;
      }
-   evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+   eo_do(data, eo_event_callback_call
+     (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
 }
 
 /* using deferred sizing evaluation, just like the parent */
@@ -249,8 +251,8 @@ _elm_frame_collapse_go(Eo *obj, Elm_Frame_Data *sd, Eina_Bool collapse)
    if (sd->collapsed == collapse) return;
 
    elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
-   evas_object_smart_callback_add
-     (wd->resize_obj, "recalc", _recalc, obj);
+   eo_do(wd->resize_obj, eo_event_callback_call
+     (EDJE_OBJECT_EVENT_RECALC, obj));
    sd->collapsed = collapse;
    sd->anim = EINA_TRUE;
 }

diff --git a/src/lib/elm_frame.eo b/src/lib/elm_frame.eo
index e6945fa..aa95b68 100644 (file)
--- a/src/lib/elm_frame.eo
+++ b/src/lib/elm_frame.eo
@@ -73,7 +73,6 @@ class Elm.Frame (Elm.Layout, Evas.Clickable_Interface)
       Elm.Layout.content_aliases.get;
    }
    events {
-      clicked;
       language,changed;
       access,changed;
    }