summaryrefslogtreecommitdiff
path: root/src/lib/elm_toolbar.c
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-06-09 16:21:46 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2015-07-02 08:04:03 +0300
commit435d49575e9146aa2a6c67a2ccf7ff3e71d3fcae (patch)
tree6c3e066ebda4a0e30b98790a00568a0ce328f1fb /src/lib/elm_toolbar.c
parent5c1b16a06583ad6809c56cee8c4f46edc1becbec (diff)
elm_toolbar: porting evas smart callbacks to eo
Diffstat (limited to 'src/lib/elm_toolbar.c')
-rw-r--r--src/lib/elm_toolbar.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index d03b587cd..b0079d745 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
159 edje_object_signal_emit(VIEW(item), "elm,state,unselected", "elm"); 159 edje_object_signal_emit(VIEW(item), "elm,state,unselected", "elm");
160 if (item->icon) 160 if (item->icon)
161 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); 161 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
162 evas_object_smart_callback_call(WIDGET(item), SIG_UNSELECTED, EO_OBJ(item)); 162 eo_do(WIDGET(item), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item)));
163} 163}
164 164
165static void 165static void
@@ -632,8 +632,8 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
632 focus_raise = edje_object_data_get(VIEW(it), "focusraise"); 632 focus_raise = edje_object_data_get(VIEW(it), "focusraise");
633 if ((focus_raise) && (!strcmp(focus_raise, "on"))) 633 if ((focus_raise) && (!strcmp(focus_raise, "on")))
634 evas_object_raise(VIEW(it)); 634 evas_object_raise(VIEW(it));
635 evas_object_smart_callback_call 635 eo_do(obj, eo_event_callback_call
636 (obj, SIG_ITEM_FOCUSED, EO_OBJ(it)); 636 (ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
637 if (_elm_config->atspi_mode) 637 if (_elm_config->atspi_mode)
638 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 638 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
639} 639}
@@ -659,8 +659,8 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
659 edje_object_signal_emit 659 edje_object_signal_emit
660 (VIEW(it), "elm,highlight,off", "elm"); 660 (VIEW(it), "elm,highlight,off", "elm");
661 sd->focused_item = NULL; 661 sd->focused_item = NULL;
662 evas_object_smart_callback_call 662 eo_do(obj, eo_event_callback_call
663 (obj, SIG_ITEM_UNFOCUSED, eo_it); 663 (ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it));
664 if (_elm_config->atspi_mode) 664 if (_elm_config->atspi_mode)
665 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 665 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
666} 666}
@@ -1159,8 +1159,8 @@ _item_select(Elm_Toolbar_Item_Data *it)
1159 { 1159 {
1160 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); 1160 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
1161 } 1161 }
1162 evas_object_smart_callback_call(obj, SIG_CLICKED, EO_OBJ(it)); 1162 eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it)));
1163 evas_object_smart_callback_call(obj, SIG_SELECTED, EO_OBJ(it)); 1163 eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it)));
1164} 1164}
1165 1165
1166static void 1166static void
@@ -2057,7 +2057,7 @@ _long_press_cb(void *data)
2057 if (sd->reorder_mode) 2057 if (sd->reorder_mode)
2058 _item_reorder_start(it); 2058 _item_reorder_start(it);
2059 2059
2060 evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it)); 2060 eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it)));
2061 2061
2062 return ECORE_CALLBACK_CANCEL; 2062 return ECORE_CALLBACK_CANCEL;
2063} 2063}
@@ -2090,7 +2090,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
2090 2090
2091 if (ev->button != 1) return; 2091 if (ev->button != 1) return;
2092 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 2092 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
2093 evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, EO_OBJ(it)); 2093 eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it)));
2094 sd->mouse_down = EINA_TRUE; 2094 sd->mouse_down = EINA_TRUE;
2095 sd->long_press = EINA_FALSE; 2095 sd->long_press = EINA_FALSE;
2096 if (sd->long_timer) 2096 if (sd->long_timer)
@@ -2157,21 +2157,21 @@ static void
2157_scroll_cb(Evas_Object *obj, 2157_scroll_cb(Evas_Object *obj,
2158 void *data EINA_UNUSED) 2158 void *data EINA_UNUSED)
2159{ 2159{
2160 evas_object_smart_callback_call(obj, SIG_SCROLL, NULL); 2160 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
2161} 2161}
2162 2162
2163static void 2163static void
2164_scroll_anim_start_cb(Evas_Object *obj, 2164_scroll_anim_start_cb(Evas_Object *obj,
2165 void *data EINA_UNUSED) 2165 void *data EINA_UNUSED)
2166{ 2166{
2167 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL); 2167 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
2168} 2168}
2169 2169
2170static void 2170static void
2171_scroll_anim_stop_cb(Evas_Object *obj, 2171_scroll_anim_stop_cb(Evas_Object *obj,
2172 void *data EINA_UNUSED) 2172 void *data EINA_UNUSED)
2173{ 2173{
2174 evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL); 2174 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
2175} 2175}
2176 2176
2177static void 2177static void
@@ -2181,14 +2181,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
2181 ELM_TOOLBAR_DATA_GET(obj, sd); 2181 ELM_TOOLBAR_DATA_GET(obj, sd);
2182 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 2182 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
2183 2183
2184 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL); 2184 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
2185} 2185}
2186 2186
2187static void 2187static void
2188_scroll_drag_stop_cb(Evas_Object *obj, 2188_scroll_drag_stop_cb(Evas_Object *obj,
2189 void *data EINA_UNUSED) 2189 void *data EINA_UNUSED)
2190{ 2190{
2191 evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL); 2191 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
2192} 2192}
2193 2193
2194static void 2194static void