summaryrefslogtreecommitdiff
path: root/src/lib/elm_toolbar.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-02 12:10:48 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 10:08:27 +0000
commite74ec8caf2c909f6dd24e1a31ac01242156b0f3f (patch)
tree79b6492c1168f43105c99bd0d78c43674d99e24f /src/lib/elm_toolbar.c
parentb805c84bbc72d07bbaff487c35bd0ea7420cdda2 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/lib/elm_toolbar.c')
-rw-r--r--src/lib/elm_toolbar.c187
1 files changed, 92 insertions, 95 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 067e47133..1546a7530 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 elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm"); 159 elm_layout_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 eo_do(WIDGET(item), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item))); 162 eo_event_callback_call(WIDGET(item), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item));
163 if (_elm_config->atspi_mode) 163 if (_elm_config->atspi_mode)
164 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 164 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
165} 165}
@@ -224,8 +224,8 @@ _item_show(Elm_Toolbar_Item_Data *it)
224 224
225 evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL); 225 evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL);
226 evas_object_geometry_get(VIEW(it), &x, &y, &w, &h); 226 evas_object_geometry_get(VIEW(it), &x, &y, &w, &h);
227 eo_do(WIDGET(it), elm_interface_scrollable_content_region_show 227 elm_interface_scrollable_content_region_show
228 (x - bx, y - by, w, h)); 228 (WIDGET(it), x - bx, y - by, w, h);
229} 229}
230 230
231static void 231static void
@@ -313,9 +313,8 @@ _elm_toolbar_item_coordinates_calc(Elm_Toolbar_Item_Data *item,
313 313
314 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd); 314 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd);
315 315
316 eo_do(WIDGET(item), 316 elm_interface_scrollable_content_viewport_geometry_get
317 elm_interface_scrollable_content_viewport_geometry_get 317 (WIDGET(item), NULL, NULL, &vw, &vh);
318 (NULL, NULL, &vw, &vh));
319 evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL); 318 evas_object_geometry_get(sd->bx, &bx, &by, NULL, NULL);
320 evas_object_geometry_get(VIEW(item), &ix, &iy, &iw, &ih); 319 evas_object_geometry_get(VIEW(item), &ix, &iy, &iw, &ih);
321 320
@@ -368,8 +367,8 @@ _resize_job(void *data)
368 ELM_TOOLBAR_DATA_GET(obj, sd); 367 ELM_TOOLBAR_DATA_GET(obj, sd);
369 368
370 sd->resize_job = NULL; 369 sd->resize_job = NULL;
371 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 370 elm_interface_scrollable_content_viewport_geometry_get
372 (NULL, NULL, &vw, &vh)); 371 (obj, NULL, NULL, &vw, &vh);
373 evas_object_size_hint_min_get(sd->bx, &mw, &mh); 372 evas_object_size_hint_min_get(sd->bx, &mw, &mh);
374 evas_object_geometry_get(sd->bx, NULL, NULL, &w, &h); 373 evas_object_geometry_get(sd->bx, NULL, NULL, &w, &h);
375 374
@@ -426,8 +425,8 @@ _resize_job(void *data)
426 menu_it = elm_menu_item_add 425 menu_it = elm_menu_item_add
427 (menu, NULL, it->icon_str, it->label, 426 (menu, NULL, it->icon_str, it->label,
428 _elm_toolbar_item_menu_cb, it); 427 _elm_toolbar_item_menu_cb, it);
429 Eina_Bool disabled = eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()); 428 Eina_Bool disabled = elm_wdg_item_disabled_get(EO_OBJ(it));
430 eo_do(menu_it, elm_wdg_item_disabled_set(disabled)); 429 elm_wdg_item_disabled_set(menu_it, disabled);
431 if (it->o_menu) 430 if (it->o_menu)
432 elm_menu_clone(it->o_menu, menu, menu_it); 431 elm_menu_clone(it->o_menu, menu, menu_it);
433 } 432 }
@@ -531,15 +530,15 @@ _resize_job(void *data)
531 { 530 {
532 if (h > vh) _items_size_fit(obj, &h, vh); 531 if (h > vh) _items_size_fit(obj, &h, vh);
533 if (sd->item_count - sd->separator_count > 0) 532 if (sd->item_count - sd->separator_count > 0)
534 eo_do(obj, elm_interface_scrollable_paging_set 533 elm_interface_scrollable_paging_set
535 (0.0, 0.0, 0, (h / (sd->item_count - sd->separator_count)))); 534 (obj, 0.0, 0.0, 0, (h / (sd->item_count - sd->separator_count)));
536 } 535 }
537 else 536 else
538 { 537 {
539 if (w > vw) _items_size_fit(obj, &w, vw); 538 if (w > vw) _items_size_fit(obj, &w, vw);
540 if (sd->item_count - sd->separator_count > 0) 539 if (sd->item_count - sd->separator_count > 0)
541 eo_do(obj, elm_interface_scrollable_paging_set 540 elm_interface_scrollable_paging_set
542 (0.0, 0.0, (w / (sd->item_count - sd->separator_count)), 0)); 541 (obj, 0.0, 0.0, (w / (sd->item_count - sd->separator_count)), 0);
543 } 542 }
544 } 543 }
545 else 544 else
@@ -634,8 +633,8 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
634 focus_raise = elm_layout_data_get(VIEW(it), "focusraise"); 633 focus_raise = elm_layout_data_get(VIEW(it), "focusraise");
635 if ((focus_raise) && (!strcmp(focus_raise, "on"))) 634 if ((focus_raise) && (!strcmp(focus_raise, "on")))
636 evas_object_raise(VIEW(it)); 635 evas_object_raise(VIEW(it));
637 eo_do(obj, eo_event_callback_call 636 eo_event_callback_call
638 (ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it))); 637 (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it));
639 if (_elm_config->atspi_mode) 638 if (_elm_config->atspi_mode)
640 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 639 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
641} 640}
@@ -661,8 +660,8 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
661 elm_layout_signal_emit 660 elm_layout_signal_emit
662 (VIEW(it), "elm,highlight,off", "elm"); 661 (VIEW(it), "elm,highlight,off", "elm");
663 sd->focused_item = NULL; 662 sd->focused_item = NULL;
664 eo_do(obj, eo_event_callback_call 663 eo_event_callback_call
665 (ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it)); 664 (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it);
666 if (_elm_config->atspi_mode) 665 if (_elm_config->atspi_mode)
667 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 666 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
668} 667}
@@ -750,7 +749,7 @@ _elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item
750 Eina_Bool int_ret = EINA_FALSE; 749 Eina_Bool int_ret = EINA_FALSE;
751 Elm_Object_Item *eo_it = NULL; 750 Elm_Object_Item *eo_it = NULL;
752 751
753 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus(NULL)); 752 int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL);
754 if (!int_ret) return EINA_FALSE; 753 if (!int_ret) return EINA_FALSE;
755 if (!sd->items) return EINA_FALSE; 754 if (!sd->items) return EINA_FALSE;
756 755
@@ -1005,7 +1004,7 @@ _elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar, Elm_Toolbar_Item_Data
1005 Eina_Bool tmp; 1004 Eina_Bool tmp;
1006 const char* emission; 1005 const char* emission;
1007 1006
1008 if (eo_do_ret(eo_toolbar, tmp, elm_wdg_item_disabled_get())) 1007 if (elm_wdg_item_disabled_get(eo_toolbar))
1009 emission = "elm,state,disabled"; 1008 emission = "elm,state,disabled";
1010 else 1009 else
1011 emission = "elm,state,enabled"; 1010 emission = "elm,state,enabled";
@@ -1086,7 +1085,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
1086 1085
1087 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd); 1086 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
1088 1087
1089 if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get()) || (it->separator) || (it->object)) 1088 if (elm_wdg_item_disabled_get(EO_OBJ(it)) || (it->separator) || (it->object))
1090 return; 1089 return;
1091 if ((sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) && (!sd->more_item)) 1090 if ((sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) && (!sd->more_item))
1092 return; 1091 return;
@@ -1177,8 +1176,8 @@ _item_select(Elm_Toolbar_Item_Data *it)
1177 { 1176 {
1178 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); 1177 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
1179 } 1178 }
1180 eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it))); 1179 eo_event_callback_call(obj, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, EO_OBJ(it));
1181 eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it))); 1180 eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it));
1182 if (_elm_config->atspi_mode) 1181 if (_elm_config->atspi_mode)
1183 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE); 1182 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
1184} 1183}
@@ -1276,7 +1275,7 @@ _item_theme_hook(Evas_Object *obj,
1276 if (it->icon) 1275 if (it->icon)
1277 elm_widget_signal_emit(it->icon, "elm,state,selected", "elm"); 1276 elm_widget_signal_emit(it->icon, "elm,state,selected", "elm");
1278 } 1277 }
1279 if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) 1278 if (elm_wdg_item_disabled_get(EO_OBJ(it)))
1280 { 1279 {
1281 elm_layout_signal_emit(view, "elm,state,disabled", "elm"); 1280 elm_layout_signal_emit(view, "elm,state,disabled", "elm");
1282 if (it->icon) 1281 if (it->icon)
@@ -1405,8 +1404,8 @@ _sizing_eval(Evas_Object *obj)
1405 evas_object_resize(wd->resize_obj, w, h); 1404 evas_object_resize(wd->resize_obj, w, h);
1406 1405
1407 evas_object_size_hint_min_get(sd->bx, &minw_bx, &minh_bx); 1406 evas_object_size_hint_min_get(sd->bx, &minw_bx, &minh_bx);
1408 eo_do(obj, elm_interface_scrollable_content_viewport_geometry_get 1407 elm_interface_scrollable_content_viewport_geometry_get
1409 (NULL, NULL, &vw, &vh)); 1408 (obj, NULL, NULL, &vw, &vh);
1410 1409
1411 if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE) 1410 if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_NONE)
1412 { 1411 {
@@ -1482,7 +1481,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1482 if (sd->delete_me) return EINA_TRUE; 1481 if (sd->delete_me) return EINA_TRUE;
1483 1482
1484 Eina_Bool int_ret = EINA_FALSE; 1483 Eina_Bool int_ret = EINA_FALSE;
1485 eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply()); 1484 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
1486 if (!int_ret) return EINA_FALSE; 1485 if (!int_ret) return EINA_FALSE;
1487 1486
1488 elm_widget_theme_object_set 1487 elm_widget_theme_object_set
@@ -1624,7 +1623,7 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo *eo_item EINA_UNUSED, Elm_
1624 1623
1625 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object")) 1624 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
1626 { 1625 {
1627 eo_do(VIEW(item), elm_obj_container_content_set(part, content)); 1626 elm_obj_container_content_set(VIEW(item), part, content);
1628 return; 1627 return;
1629 } 1628 }
1630 if (item->object == content) return; 1629 if (item->object == content) return;
@@ -1647,7 +1646,7 @@ _elm_toolbar_item_elm_widget_item_part_content_get(Eo *eo_it EINA_UNUSED, Elm_To
1647 1646
1648 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object")) 1647 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
1649 { 1648 {
1650 eo_do(VIEW(it), content = elm_obj_container_content_get(part)); 1649 content = elm_obj_container_content_get(VIEW(it), part);
1651 if (content) return content; 1650 if (content) return content;
1652 else return NULL; 1651 else return NULL;
1653 } 1652 }
@@ -1666,7 +1665,7 @@ _elm_toolbar_item_elm_widget_item_part_content_unset(Eo *eo_item EINA_UNUSED, El
1666 1665
1667 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object")) 1666 if (part && strcmp(part, "object") && strcmp(part, "elm.swallow.object"))
1668 { 1667 {
1669 eo_do(VIEW(item), o = elm_obj_container_content_unset(part)); 1668 o = elm_obj_container_content_unset(VIEW(item), part);
1670 return o; 1669 return o;
1671 } 1670 }
1672 1671
@@ -1686,9 +1685,9 @@ _elm_toolbar_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
1686 Elm_Toolbar_Item_Data *it; 1685 Elm_Toolbar_Item_Data *it;
1687 1686
1688 EINA_INLIST_FOREACH(sd->items, it) 1687 EINA_INLIST_FOREACH(sd->items, it)
1689 eo_do(EO_OBJ(it), elm_wdg_item_translate()); 1688 elm_wdg_item_translate(EO_OBJ(it));
1690 1689
1691 eo_do_super(obj, MY_CLASS, elm_obj_widget_translate()); 1690 elm_obj_widget_translate(eo_super(obj, MY_CLASS));
1692 1691
1693 return EINA_TRUE; 1692 return EINA_TRUE;
1694} 1693}
@@ -2053,7 +2052,7 @@ _mouse_up_reorder(Elm_Toolbar_Item_Data *it,
2053 ELM_SAFE_FREE(it->proxy, evas_object_del); 2052 ELM_SAFE_FREE(it->proxy, evas_object_del);
2054 } 2053 }
2055 2054
2056 eo_do(obj, elm_interface_scrollable_hold_set(EINA_FALSE)); 2055 elm_interface_scrollable_hold_set(obj, EINA_FALSE);
2057} 2056}
2058 2057
2059static void 2058static void
@@ -2101,7 +2100,7 @@ _item_reorder_start(Elm_Toolbar_Item_Data *item)
2101 evas_object_move(item->proxy, x, y); 2100 evas_object_move(item->proxy, x, y);
2102 evas_object_show(item->proxy); 2101 evas_object_show(item->proxy);
2103 2102
2104 eo_do(WIDGET(item), elm_interface_scrollable_hold_set(EINA_TRUE)); 2103 elm_interface_scrollable_hold_set(WIDGET(item), EINA_TRUE);
2105} 2104}
2106 2105
2107static Eina_Bool 2106static Eina_Bool
@@ -2116,7 +2115,7 @@ _long_press_cb(void *data)
2116 if (sd->reorder_mode) 2115 if (sd->reorder_mode)
2117 _item_reorder_start(it); 2116 _item_reorder_start(it);
2118 2117
2119 eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it))); 2118 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_LONGPRESSED, EO_OBJ(it));
2120 2119
2121 return ECORE_CALLBACK_CANCEL; 2120 return ECORE_CALLBACK_CANCEL;
2122} 2121}
@@ -2149,7 +2148,7 @@ _mouse_down_cb(Elm_Toolbar_Item_Data *it,
2149 2148
2150 if (ev->button != 1) return; 2149 if (ev->button != 1) return;
2151 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 2150 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
2152 eo_do(WIDGET(it), eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it))); 2151 eo_event_callback_call(WIDGET(it), EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, EO_OBJ(it));
2153 sd->mouse_down = EINA_TRUE; 2152 sd->mouse_down = EINA_TRUE;
2154 sd->long_press = EINA_FALSE; 2153 sd->long_press = EINA_FALSE;
2155 if (sd->long_timer) 2154 if (sd->long_timer)
@@ -2216,21 +2215,21 @@ static void
2216_scroll_cb(Evas_Object *obj, 2215_scroll_cb(Evas_Object *obj,
2217 void *data EINA_UNUSED) 2216 void *data EINA_UNUSED)
2218{ 2217{
2219 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL)); 2218 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL);
2220} 2219}
2221 2220
2222static void 2221static void
2223_scroll_anim_start_cb(Evas_Object *obj, 2222_scroll_anim_start_cb(Evas_Object *obj,
2224 void *data EINA_UNUSED) 2223 void *data EINA_UNUSED)
2225{ 2224{
2226 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL)); 2225 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL);
2227} 2226}
2228 2227
2229static void 2228static void
2230_scroll_anim_stop_cb(Evas_Object *obj, 2229_scroll_anim_stop_cb(Evas_Object *obj,
2231 void *data EINA_UNUSED) 2230 void *data EINA_UNUSED)
2232{ 2231{
2233 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL)); 2232 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL);
2234} 2233}
2235 2234
2236static void 2235static void
@@ -2240,14 +2239,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
2240 ELM_TOOLBAR_DATA_GET(obj, sd); 2239 ELM_TOOLBAR_DATA_GET(obj, sd);
2241 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 2240 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
2242 2241
2243 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL)); 2242 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL);
2244} 2243}
2245 2244
2246static void 2245static void
2247_scroll_drag_stop_cb(Evas_Object *obj, 2246_scroll_drag_stop_cb(Evas_Object *obj,
2248 void *data EINA_UNUSED) 2247 void *data EINA_UNUSED)
2249{ 2248{
2250 eo_do(obj, eo_event_callback_call(EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL)); 2249 eo_event_callback_call(obj, EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL);
2251} 2250}
2252 2251
2253static void 2252static void
@@ -2282,7 +2281,7 @@ _access_state_cb(void *data, Evas_Object *obj EINA_UNUSED)
2282 2281
2283 if (it->separator) 2282 if (it->separator)
2284 return strdup(E_("Separator")); 2283 return strdup(E_("Separator"));
2285 else if (eo_do_ret(EO_OBJ(it), tmp, elm_wdg_item_disabled_get())) 2284 else if (elm_wdg_item_disabled_get(EO_OBJ(it)))
2286 return strdup(E_("State: Disabled")); 2285 return strdup(E_("State: Disabled"));
2287 else if (it->selected) 2286 else if (it->selected)
2288 return strdup(E_("State: Selected")); 2287 return strdup(E_("State: Selected"));
@@ -2319,9 +2318,9 @@ _elm_toolbar_item_eo_base_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item)
2319 _item_del(item); 2318 _item_del(item);
2320 2319
2321 if (item != sd->more_item) 2320 if (item != sd->more_item)
2322 eo_do(obj, elm_obj_widget_theme_apply()); 2321 elm_obj_widget_theme_apply(obj);
2323 2322
2324 eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, eo_destructor()); 2323 eo_destructor(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
2325} 2324}
2326 2325
2327static void 2326static void
@@ -2333,7 +2332,7 @@ _access_activate_cb(void *data EINA_UNUSED,
2333 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd); 2332 ELM_TOOLBAR_DATA_GET(WIDGET(it), sd);
2334 Eina_Bool tmp; 2333 Eina_Bool tmp;
2335 2334
2336 if (eo_do_ret(item, tmp, elm_wdg_item_disabled_get())) return; 2335 if (elm_wdg_item_disabled_get(item)) return;
2337 2336
2338 if (it->selected && (sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS)) 2337 if (it->selected && (sd->select_mode != ELM_OBJECT_SELECT_MODE_ALWAYS))
2339 { 2338 {
@@ -2363,9 +2362,9 @@ _access_widget_item_register(Elm_Toolbar_Item_Data *it)
2363EOLIAN static Eo * 2362EOLIAN static Eo *
2364_elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it) 2363_elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
2365{ 2364{
2366 eo_it = eo_do_super_ret(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_it, eo_constructor()); 2365 eo_it = eo_constructor(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
2367 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 2366 it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
2368 eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM)); 2367 elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_MENU_ITEM);
2369 2368
2370 return eo_it; 2369 return eo_it;
2371} 2370}
@@ -2397,7 +2396,7 @@ _item_new(Evas_Object *obj,
2397 2396
2398 VIEW(it) = elm_layout_add(obj); 2397 VIEW(it) = elm_layout_add(obj);
2399 evas_object_data_set(VIEW(it), "item", it); 2398 evas_object_data_set(VIEW(it), "item", it);
2400 eo_do(VIEW(it), elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED)); 2399 elm_interface_atspi_accessible_type_set(VIEW(it), ELM_ATSPI_TYPE_DISABLED);
2401 2400
2402 icon_obj = elm_icon_add(VIEW(it)); 2401 icon_obj = elm_icon_add(VIEW(it));
2403 elm_icon_order_lookup_set(icon_obj, sd->lookup_order); 2402 elm_icon_order_lookup_set(icon_obj, sd->lookup_order);
@@ -2726,7 +2725,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
2726 edje = edje_object_add(evas_object_evas_get(obj)); 2725 edje = edje_object_add(evas_object_evas_get(obj));
2727 elm_widget_resize_object_set(obj, edje, EINA_TRUE); 2726 elm_widget_resize_object_set(obj, edje, EINA_TRUE);
2728 2727
2729 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 2728 evas_obj_smart_add(eo_super(obj, MY_CLASS));
2730 2729
2731 elm_widget_theme_object_set 2730 elm_widget_theme_object_set
2732 (obj, edje, "toolbar", "base", elm_widget_style_get(obj)); 2731 (obj, edje, "toolbar", "base", elm_widget_style_get(obj));
@@ -2742,20 +2741,19 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
2742 2741
2743 elm_widget_can_focus_set(obj, EINA_TRUE); 2742 elm_widget_can_focus_set(obj, EINA_TRUE);
2744 2743
2745 eo_do(obj, elm_interface_scrollable_objects_set(edje, priv->hit_rect)); 2744 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
2746 2745
2747 priv->standard_priority = -99999; 2746 priv->standard_priority = -99999;
2748 2747
2749 eo_do(obj, 2748 elm_interface_scrollable_bounce_allow_set
2750 elm_interface_scrollable_bounce_allow_set 2749 (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE);
2751 (_elm_config->thumbscroll_bounce_enable, EINA_FALSE), 2750 elm_interface_scrollable_policy_set
2752 elm_interface_scrollable_policy_set 2751 (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
2753 (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF), 2752 elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
2754 elm_interface_scrollable_scroll_cb_set(_scroll_cb), 2753 elm_interface_scrollable_animate_start_cb_set(obj, _scroll_anim_start_cb);
2755 elm_interface_scrollable_animate_start_cb_set(_scroll_anim_start_cb), 2754 elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_anim_stop_cb);
2756 elm_interface_scrollable_animate_stop_cb_set(_scroll_anim_stop_cb), 2755 elm_interface_scrollable_drag_start_cb_set(obj, _scroll_drag_start_cb);
2757 elm_interface_scrollable_drag_start_cb_set(_scroll_drag_start_cb), 2756 elm_interface_scrollable_drag_stop_cb_set(obj, _scroll_drag_stop_cb);
2758 elm_interface_scrollable_drag_stop_cb_set(_scroll_drag_stop_cb));
2759 2757
2760 edje_object_signal_callback_add 2758 edje_object_signal_callback_add
2761 (edje, "elm,action,left", "elm", _elm_toolbar_action_left_cb, obj); 2759 (edje, "elm,action,left", "elm", _elm_toolbar_action_left_cb, obj);
@@ -2777,7 +2775,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
2777 evas_object_box_align_set(priv->bx, priv->align, 0.5); 2775 evas_object_box_align_set(priv->bx, priv->align, 0.5);
2778 evas_object_box_layout_set(priv->bx, _layout, obj, NULL); 2776 evas_object_box_layout_set(priv->bx, _layout, obj, NULL);
2779 elm_widget_sub_object_add(obj, priv->bx); 2777 elm_widget_sub_object_add(obj, priv->bx);
2780 eo_do(obj, elm_interface_scrollable_content_set(priv->bx)); 2778 elm_interface_scrollable_content_set(obj, priv->bx);
2781 evas_object_show(priv->bx); 2779 evas_object_show(priv->bx);
2782 2780
2783 priv->more = elm_layout_add(obj); 2781 priv->more = elm_layout_add(obj);
@@ -2788,7 +2786,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv)
2788 else 2786 else
2789 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); 2787 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
2790 2788
2791 eo_do(priv->more, elm_interface_atspi_accessible_type_set(ELM_ATSPI_TYPE_DISABLED)); 2789 elm_interface_atspi_accessible_type_set(priv->more, ELM_ATSPI_TYPE_DISABLED);
2792 elm_widget_sub_object_add(obj, priv->more); 2790 elm_widget_sub_object_add(obj, priv->more);
2793 evas_object_show(priv->more); 2791 evas_object_show(priv->more);
2794 2792
@@ -2833,19 +2831,19 @@ _elm_toolbar_evas_object_smart_del(Eo *obj, Elm_Toolbar_Data *sd)
2833 while (it) 2831 while (it)
2834 { 2832 {
2835 next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); 2833 next = ELM_TOOLBAR_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
2836 eo_do(EO_OBJ(it), elm_wdg_item_del()); 2834 elm_wdg_item_del(EO_OBJ(it));
2837 it = next; 2835 it = next;
2838 } 2836 }
2839 if (sd->more_item) eo_do(EO_OBJ(sd->more_item), elm_wdg_item_del()); 2837 if (sd->more_item) elm_wdg_item_del(EO_OBJ(sd->more_item));
2840 ecore_timer_del(sd->long_timer); 2838 ecore_timer_del(sd->long_timer);
2841 2839
2842 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 2840 evas_obj_smart_del(eo_super(obj, MY_CLASS));
2843} 2841}
2844 2842
2845EOLIAN static void 2843EOLIAN static void
2846_elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y) 2844_elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y)
2847{ 2845{
2848 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 2846 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
2849 2847
2850 evas_object_move(sd->hit_rect, x, y); 2848 evas_object_move(sd->hit_rect, x, y);
2851} 2849}
@@ -2853,7 +2851,7 @@ _elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x,
2853EOLIAN static void 2851EOLIAN static void
2854_elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h) 2852_elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h)
2855{ 2853{
2856 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 2854 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
2857 2855
2858 evas_object_resize(sd->hit_rect, w, h); 2856 evas_object_resize(sd->hit_rect, w, h);
2859} 2857}
@@ -2861,7 +2859,7 @@ _elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord
2861EOLIAN static void 2859EOLIAN static void
2862_elm_toolbar_evas_object_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member) 2860_elm_toolbar_evas_object_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member)
2863{ 2861{
2864 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 2862 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
2865 2863
2866 if (sd->hit_rect) 2864 if (sd->hit_rect)
2867 evas_object_raise(sd->hit_rect); 2865 evas_object_raise(sd->hit_rect);
@@ -3004,11 +3002,10 @@ elm_toolbar_add(Evas_Object *parent)
3004EOLIAN static Eo * 3002EOLIAN static Eo *
3005_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) 3003_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
3006{ 3004{
3007 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 3005 obj = eo_constructor(eo_super(obj, MY_CLASS));
3008 eo_do(obj, 3006 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
3009 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 3007 evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3010 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks), 3008 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR);
3011 elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TOOL_BAR));
3012 3009
3013 return obj; 3010 return obj;
3014} 3011}
@@ -3022,7 +3019,7 @@ _elm_toolbar_icon_size_set(Eo *obj, Elm_Toolbar_Data *sd, int icon_size)
3022 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; 3019 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
3023 else sd->icon_size = sd->theme_icon_size; 3020 else sd->icon_size = sd->theme_icon_size;
3024 3021
3025 eo_do(obj, elm_obj_widget_theme_apply()); 3022 elm_obj_widget_theme_apply(obj);
3026} 3023}
3027 3024
3028EOLIAN static int 3025EOLIAN static int
@@ -3365,39 +3362,39 @@ _elm_toolbar_shrink_mode_set(Eo *obj, Elm_Toolbar_Data *sd, Elm_Toolbar_Shrink_M
3365 sd->shrink_mode = shrink_mode; 3362 sd->shrink_mode = shrink_mode;
3366 bounce = (_elm_config->thumbscroll_bounce_enable) && 3363 bounce = (_elm_config->thumbscroll_bounce_enable) &&
3367 (shrink_mode == ELM_TOOLBAR_SHRINK_SCROLL); 3364 (shrink_mode == ELM_TOOLBAR_SHRINK_SCROLL);
3368 eo_do(obj, elm_interface_scrollable_bounce_allow_set(bounce, EINA_FALSE)); 3365 elm_interface_scrollable_bounce_allow_set(obj, bounce, EINA_FALSE);
3369 3366
3370 if (sd->more_item) 3367 if (sd->more_item)
3371 { 3368 {
3372 eo_do(EO_OBJ(sd->more_item), elm_wdg_item_del()); 3369 elm_wdg_item_del(EO_OBJ(sd->more_item));
3373 sd->more_item = NULL; 3370 sd->more_item = NULL;
3374 } 3371 }
3375 3372
3376 if (shrink_mode == ELM_TOOLBAR_SHRINK_MENU) 3373 if (shrink_mode == ELM_TOOLBAR_SHRINK_MENU)
3377 { 3374 {
3378 elm_toolbar_homogeneous_set(obj, EINA_FALSE); 3375 elm_toolbar_homogeneous_set(obj, EINA_FALSE);
3379 eo_do(obj, elm_interface_scrollable_policy_set 3376 elm_interface_scrollable_policy_set
3380 (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF)); 3377 (obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
3381 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL); 3378 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
3382 _resizing_eval_item(sd->more_item); 3379 _resizing_eval_item(sd->more_item);
3383 } 3380 }
3384 else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE) 3381 else if (shrink_mode == ELM_TOOLBAR_SHRINK_HIDE)
3385 { 3382 {
3386 elm_toolbar_homogeneous_set(obj, EINA_FALSE); 3383 elm_toolbar_homogeneous_set(obj, EINA_FALSE);
3387 eo_do(obj, elm_interface_scrollable_policy_set 3384 elm_interface_scrollable_policy_set
3388 (ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF)); 3385 (obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
3389 } 3386 }
3390 else if (shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) 3387 else if (shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
3391 { 3388 {
3392 elm_toolbar_homogeneous_set(obj, EINA_FALSE); 3389 elm_toolbar_homogeneous_set(obj, EINA_FALSE);
3393 eo_do(obj, elm_interface_scrollable_policy_set 3390 elm_interface_scrollable_policy_set
3394 (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF)); 3391 (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
3395 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL); 3392 sd->more_item = _item_new(obj, "more_menu", "More", NULL, NULL);
3396 _resizing_eval_item(sd->more_item); 3393 _resizing_eval_item(sd->more_item);
3397 } 3394 }
3398 else 3395 else
3399 eo_do(obj, elm_interface_scrollable_policy_set 3396 elm_interface_scrollable_policy_set
3400 (ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF)); 3397 (obj, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
3401 3398
3402 EINA_INLIST_FOREACH(sd->items, it) 3399 EINA_INLIST_FOREACH(sd->items, it)
3403 _item_shrink_signal_emit(VIEW(it), sd->shrink_mode); 3400 _item_shrink_signal_emit(VIEW(it), sd->shrink_mode);
@@ -3647,7 +3644,7 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
3647 if (item->icon) 3644 if (item->icon)
3648 { 3645 {
3649 Eina_Bool tmp; 3646 Eina_Bool tmp;
3650 if (eo_do_ret(EO_OBJ(item), tmp, elm_wdg_item_disabled_get())) 3647 if (elm_wdg_item_disabled_get(EO_OBJ(item)))
3651 elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm"); 3648 elm_widget_signal_emit(item->icon, "elm,state,disabled", "elm");
3652 else 3649 else
3653 elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm"); 3650 elm_widget_signal_emit(item->icon, "elm,state,enabled", "elm");
@@ -3661,7 +3658,7 @@ _elm_toolbar_item_state_set(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item
3661EAPI void 3658EAPI void
3662elm_toolbar_item_state_unset(Elm_Object_Item *it) 3659elm_toolbar_item_state_unset(Elm_Object_Item *it)
3663{ 3660{
3664 eo_do(it, elm_obj_toolbar_item_state_set(NULL)); 3661 elm_obj_toolbar_item_state_set(it, NULL);
3665} 3662}
3666 3663
3667EOLIAN static Elm_Toolbar_Item_State * 3664EOLIAN static Elm_Toolbar_Item_State *
@@ -3815,8 +3812,8 @@ _elm_toolbar_item_show(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item,
3815 ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item); 3812 ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
3816 3813
3817 if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h)) 3814 if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h))
3818 eo_do(WIDGET(item), elm_interface_scrollable_content_region_show 3815 elm_interface_scrollable_content_region_show
3819 (x, y, w, h)); 3816 (WIDGET(item), x, y, w, h);
3820} 3817}
3821 3818
3822EOLIAN static void 3819EOLIAN static void
@@ -3828,15 +3825,15 @@ _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item,
3828 ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item); 3825 ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(item);
3829 3826
3830 if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h)) 3827 if (_elm_toolbar_item_coordinates_calc(item, type, &x, &y, &w, &h))
3831 eo_do(WIDGET(item), elm_interface_scrollable_region_bring_in 3828 elm_interface_scrollable_region_bring_in
3832 (x, y, w, h)); 3829 (WIDGET(item), x, y, w, h);
3833} 3830}
3834 3831
3835EOLIAN static char* 3832EOLIAN static char*
3836_elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item) 3833_elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item)
3837{ 3834{
3838 char *ret; 3835 char *ret;
3839 eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get()); 3836 ret = elm_interface_atspi_accessible_name_get(eo_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
3840 if (ret) return ret; 3837 if (ret) return ret;
3841 return item->label ? strdup(item->label) : NULL; 3838 return item->label ? strdup(item->label) : NULL;
3842} 3839}
@@ -3847,9 +3844,9 @@ _elm_toolbar_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_To
3847 Elm_Atspi_State_Set ret; 3844 Elm_Atspi_State_Set ret;
3848 Eina_Bool sel; 3845 Eina_Bool sel;
3849 3846
3850 eo_do_super(eo_it, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_state_set_get()); 3847 ret = elm_interface_atspi_accessible_state_set_get(eo_super(eo_it, ELM_TOOLBAR_ITEM_CLASS));
3851 3848
3852 eo_do(eo_it, sel = elm_obj_toolbar_item_selected_get()); 3849 sel = elm_obj_toolbar_item_selected_get(eo_it);
3853 3850
3854 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); 3851 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE);
3855 3852
@@ -3890,7 +3887,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
3890{ 3887{
3891 Eina_List *ret = NULL, *ret2 = NULL; 3888 Eina_List *ret = NULL, *ret2 = NULL;
3892 Elm_Toolbar_Item_Data *it; 3889 Elm_Toolbar_Item_Data *it;
3893 eo_do_super(obj, ELM_TOOLBAR_CLASS, ret2 = elm_interface_atspi_accessible_children_get()); 3890 ret2 = elm_interface_atspi_accessible_children_get(eo_super(obj, ELM_TOOLBAR_CLASS));
3894 3891
3895 EINA_INLIST_FOREACH(sd->items, it) 3892 EINA_INLIST_FOREACH(sd->items, it)
3896 ret = eina_list_append(ret, EO_OBJ(it)); 3893 ret = eina_list_append(ret, EO_OBJ(it));
@@ -3902,7 +3899,7 @@ EOLIAN static Elm_Atspi_State_Set
3902_elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED) 3899_elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
3903{ 3900{
3904 Elm_Atspi_State_Set ret; 3901 Elm_Atspi_State_Set ret;
3905 eo_do_super(obj, ELM_TOOLBAR_CLASS, ret = elm_interface_atspi_accessible_state_set_get()); 3902 ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
3906 3903
3907 return ret; 3904 return ret;
3908} 3905}