efl_ui_focus_object: apply new event calling convention
authorMarcel Hollerbach <mail@marcel-hollerbach.de>
Tue, 19 Mar 2019 20:31:55 +0000 (16:31 -0400)
committerYeongjong Lee <yj34.lee@samsung.com>
Tue, 2 Apr 2019 03:45:17 +0000 (12:45 +0900)
Summary:
ref T7758
Depends on D8408

Reviewers: cedric, zmike, segfaultxavi

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7758

Differential Revision: https://phab.enlightenment.org/D8409

src/lib/elementary/efl_ui_focus_manager_calc.c
src/lib/elementary/efl_ui_focus_object.c

index 2c489a0..3ccb48e 100644 (file)
@@ -1566,10 +1566,16 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_U
      }
 
    while (eina_array_count(chain) > 1)
-     efl_event_callback_call(eina_array_pop(chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED , (void*)EINA_TRUE);
+     {
+        Eina_Bool child_focus_changed = EINA_TRUE;
+        efl_event_callback_call(eina_array_pop(chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED , &child_focus_changed);
+     }
 
    while (eina_array_count(old_chain) > 1)
-     efl_event_callback_call(eina_array_pop(old_chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED, (void*)EINA_FALSE);
+     {
+        Eina_Bool child_focus_changed = EINA_FALSE;
+        efl_event_callback_call(eina_array_pop(old_chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED, &child_focus_changed);
+     }
 
 end:
    eina_array_free(old_chain);
index 1dc19a6..92f8578 100644 (file)
@@ -24,7 +24,7 @@ _efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Focus_Object_Data *pd, Eina_Bool
    parent = efl_ui_focus_object_focus_parent_get(obj);
    if (parent)
      efl_ui_focus_object_child_focus_set(parent, focus);
-   efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , (void*) (uintptr_t) focus);
+   efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , &focus);
 }
 
 EOLIAN static Eina_Bool