ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=997d0261fb5e436d9398ae8f5ce3d8aa58796bcc
commit 997d0261fb5e436d9398ae8f5ce3d8aa58796bcc Author: Amitesh Singh <[email protected]> Date: Tue May 23 15:41:17 2017 +0900 Efl.Ui.Radio: correct the 'changed' event name Signed-off-by: Amitesh Singh <[email protected]> --- src/bin/elementary/test_ui_box.c | 10 +++++----- src/bin/elementary/test_ui_grid.c | 12 ++++++------ src/lib/elementary/efl_ui_radio.c | 2 +- src/lib/elementary/efl_ui_radio.eo | 2 -- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index e047ea9..5b41820 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -253,7 +253,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in chk = o = elm_radio_add(win); elm_object_text_set(o, "No weight"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, win); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE); efl_pack(bx, o); @@ -261,7 +261,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "No weight + box fill"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, win); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_group_add(o, chk); @@ -270,7 +270,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "Equal weights"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, win); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, EQUAL); elm_radio_group_add(o, chk); @@ -279,7 +279,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "One weight only"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, win); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, ONE); elm_radio_group_add(o, chk); @@ -288,7 +288,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in o = elm_radio_add(win); elm_object_text_set(o, "Two weights"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, win); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, TWO); elm_radio_group_add(o, chk); diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index 9d4e759..62dd813 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -213,7 +213,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i chk = o = elm_radio_add(win); elm_object_text_set(o, "No weight"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE); efl_pack(bx, o); @@ -221,7 +221,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i o = elm_radio_add(win); elm_object_text_set(o, "No weight + grid fill"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, NONE_BUT_FILL); elm_radio_group_add(o, chk); @@ -230,7 +230,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i o = elm_radio_add(win); elm_object_text_set(o, "Equal weights"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, EQUAL); elm_radio_group_add(o, chk); @@ -239,7 +239,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i o = elm_radio_add(win); elm_object_text_set(o, "One weight only"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, ONE); elm_radio_group_add(o, chk); @@ -248,7 +248,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i o = elm_radio_add(win); elm_object_text_set(o, "Two weights"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, TWO); elm_radio_group_add(o, chk); @@ -257,7 +257,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i o = elm_radio_add(win); elm_object_text_set(o, "Custom layout"); - efl_event_callback_add(o, ELM_RADIO_EVENT_CHANGED, weights_cb, grid); + efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, grid); efl_gfx_size_hint_align_set(o, 0, 0.5); elm_radio_state_value_set(o, CUSTOM); elm_radio_group_add(o, chk); diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index f4779fd..14ddc9b 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -119,7 +119,7 @@ _activate(Evas_Object *obj) if (_elm_config->access_mode) _elm_access_say(E_("State: On")); efl_event_callback_legacy_call - (obj, ELM_RADIO_EVENT_CHANGED, NULL); + (obj, EFL_UI_RADIO_EVENT_CHANGED, NULL); } } diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index b733758..911126f 100644 --- a/src/lib/elementary/efl_ui_radio.eo +++ b/src/lib/elementary/efl_ui_radio.eo @@ -2,8 +2,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action) { [[Elementary radio class]] legacy_prefix: elm_radio; - //eo_prefix: elm_obj_radio; - event_prefix: elm_radio; methods { @property state_value { set { --
