summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2014-06-30 21:37:04 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2014-06-30 21:37:04 +0100
commitcc6f0cbbfa168e44a2aa0e9966e2fe10e023aabf (patch)
tree94d08e26da46d7cd22f578fc0afa6c4baf7c7728
parent5f0a4ff14fc670c8678dea15f65dda31606a484f (diff)
update according to latest efl changes: _CLASS -> _CLASS/INTERFACE/MIXIN
-rw-r--r--src/lib/elm_atspi_app_object.c2
-rw-r--r--src/lib/elm_atspi_bridge.c46
-rw-r--r--src/lib/elm_entry.c2
-rw-r--r--src/lib/elm_interface_atspi_accessible.c4
-rw-r--r--src/lib/elm_interface_atspi_component.c2
-rw-r--r--src/lib/elm_interface_atspi_widget.c12
-rw-r--r--src/lib/elm_interface_fileselector.h2
-rw-r--r--src/lib/elm_interface_scrollable.c2
-rw-r--r--src/lib/elm_interface_scrollable.h2
-rw-r--r--src/lib/elm_widget.c2
10 files changed, 38 insertions, 38 deletions
diff --git a/src/lib/elm_atspi_app_object.c b/src/lib/elm_atspi_app_object.c
index 7a01e6733..8e8576a52 100644
--- a/src/lib/elm_atspi_app_object.c
+++ b/src/lib/elm_atspi_app_object.c
@@ -40,7 +40,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
40 EINA_LIST_FOREACH(_elm_win_list, l, win) 40 EINA_LIST_FOREACH(_elm_win_list, l, win)
41 { 41 {
42 if (!win) continue; 42 if (!win) continue;
43 if (eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 43 if (eo_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
44 accs = eina_list_append(accs, win); 44 accs = eina_list_append(accs, win);
45 } 45 }
46 46
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index a82b05cb5..4aca86a51 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -1746,7 +1746,7 @@ _access_object_from_path(const char *path)
1746 1746
1747 sscanf(tmp, "%llu", &eo_ptr); 1747 sscanf(tmp, "%llu", &eo_ptr);
1748 eo = (Eo *) (uintptr_t) eo_ptr; 1748 eo = (Eo *) (uintptr_t) eo_ptr;
1749 return eo_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS) ? eo : NULL; 1749 return eo_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? eo : NULL;
1750} 1750}
1751 1751
1752static char * 1752static char *
@@ -2074,21 +2074,21 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
2074 iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); 2074 iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
2075 if (!iter_array) return; 2075 if (!iter_array) return;
2076 2076
2077 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 2077 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
2078 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); 2078 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
2079 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_CLASS)) 2079 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
2080 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 2080 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
2081 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_CLASS)) 2081 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
2082 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION); 2082 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION);
2083 if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_CLASS)) 2083 if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
2084 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE); 2084 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE);
2085 if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_CLASS)) 2085 if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
2086 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 2086 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
2087 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS)) 2087 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
2088 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT); 2088 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);
2089 if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_CLASS)) 2089 if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE))
2090 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 2090 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
2091 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS)) 2091 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
2092 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 2092 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
2093 2093
2094 eldbus_message_iter_container_close(iter, iter_array); 2094 eldbus_message_iter_container_close(iter, iter_array);
@@ -3122,7 +3122,7 @@ _cache_build(void *obj)
3122 Eo *child; 3122 Eo *child;
3123 char *path = NULL; 3123 char *path = NULL;
3124 3124
3125 if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 3125 if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
3126 return; 3126 return;
3127 3127
3128 path = _path_from_access_object(obj); 3128 path = _path_from_access_object(obj);
@@ -3178,7 +3178,7 @@ static void _object_register(Eo *obj, char *path)
3178{ 3178{
3179 Eldbus_Service_Interface *infc = NULL, *event_infc; 3179 Eldbus_Service_Interface *infc = NULL, *event_infc;
3180 3180
3181 if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 3181 if (!eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
3182 { 3182 {
3183 WRN("Unable to register class w/o Elm_Interface_Atspi_Accessible!"); 3183 WRN("Unable to register class w/o Elm_Interface_Atspi_Accessible!");
3184 return; 3184 return;
@@ -3192,31 +3192,31 @@ static void _object_register(Eo *obj, char *path)
3192 eo_do(obj, eo_key_data_set("event_interface", event_infc, NULL)); 3192 eo_do(obj, eo_key_data_set("event_interface", event_infc, NULL));
3193 eo_do(obj, eo_event_callback_array_add(_events_cb(), event_infc)); 3193 eo_do(obj, eo_event_callback_array_add(_events_cb(), event_infc));
3194 3194
3195 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_CLASS)) 3195 if (eo_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN))
3196 eldbus_service_interface_register(_a11y_bus, path, &component_iface_desc); 3196 eldbus_service_interface_register(_a11y_bus, path, &component_iface_desc);
3197 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_CLASS)) 3197 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE))
3198 { 3198 {
3199 infc = eldbus_service_interface_register(_a11y_bus, path, &window_iface_desc); 3199 infc = eldbus_service_interface_register(_a11y_bus, path, &window_iface_desc);
3200 eo_do(obj, eo_key_data_set("window_interface", infc, NULL)); 3200 eo_do(obj, eo_key_data_set("window_interface", infc, NULL));
3201 eo_do(obj, eo_event_callback_array_add(_window_cb(), infc)); 3201 eo_do(obj, eo_event_callback_array_add(_window_cb(), infc));
3202 } 3202 }
3203 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_CLASS)) 3203 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACTION_MIXIN))
3204 eldbus_service_interface_register(_a11y_bus, path, &action_iface_desc); 3204 eldbus_service_interface_register(_a11y_bus, path, &action_iface_desc);
3205 if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_CLASS)) 3205 if (eo_isa(obj, ELM_INTERFACE_ATSPI_VALUE_INTERFACE))
3206 eldbus_service_interface_register(_a11y_bus, path, &value_iface_desc); 3206 eldbus_service_interface_register(_a11y_bus, path, &value_iface_desc);
3207 if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_CLASS)) 3207 if (eo_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN))
3208 eldbus_service_interface_register(_a11y_bus, path, &image_iface_desc); 3208 eldbus_service_interface_register(_a11y_bus, path, &image_iface_desc);
3209 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS)) 3209 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
3210 { 3210 {
3211 eldbus_service_interface_register(_a11y_bus, path, &selection_iface_desc); 3211 eldbus_service_interface_register(_a11y_bus, path, &selection_iface_desc);
3212 eo_do(obj, eo_event_callback_array_add(_selection_cb(), event_infc)); 3212 eo_do(obj, eo_event_callback_array_add(_selection_cb(), event_infc));
3213 } 3213 }
3214 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS)) 3214 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
3215 { 3215 {
3216 eldbus_service_interface_register(_a11y_bus, path, &text_iface_desc); 3216 eldbus_service_interface_register(_a11y_bus, path, &text_iface_desc);
3217 eo_do(obj, eo_event_callback_array_add(_text_cb(), event_infc)); 3217 eo_do(obj, eo_event_callback_array_add(_text_cb(), event_infc));
3218 } 3218 }
3219 if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_CLASS)) 3219 if (eo_isa(obj, ELM_INTERFACE_ATSPI_EDITABLE_TEXT_INTERFACE))
3220 eldbus_service_interface_register(_a11y_bus, path, &editable_text_iface_desc); 3220 eldbus_service_interface_register(_a11y_bus, path, &editable_text_iface_desc);
3221 } 3221 }
3222} 3222}
@@ -3234,16 +3234,16 @@ static void _object_unregister(void *obj)
3234 3234
3235 eo_do(obj, eo_event_callback_del(EO_EV_DEL, _on_cache_item_del, NULL)); 3235 eo_do(obj, eo_event_callback_del(EO_EV_DEL, _on_cache_item_del, NULL));
3236 3236
3237 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 3237 if (eo_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
3238 eo_do(obj, eo_event_callback_array_del(_events_cb(), event_infc)); 3238 eo_do(obj, eo_event_callback_array_del(_events_cb(), event_infc));
3239 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_CLASS)) 3239 if (eo_isa(obj, ELM_INTERFACE_ATSPI_WINDOW_INTERFACE))
3240 { 3240 {
3241 eo_do(obj, infc = eo_key_data_get("window_interface")); 3241 eo_do(obj, infc = eo_key_data_get("window_interface"));
3242 eo_do(obj, eo_event_callback_array_del(_window_cb(), infc)); 3242 eo_do(obj, eo_event_callback_array_del(_window_cb(), infc));
3243 } 3243 }
3244 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_CLASS)) 3244 if (eo_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE))
3245 eo_do(obj, eo_event_callback_array_del(_selection_cb(), event_infc)); 3245 eo_do(obj, eo_event_callback_array_del(_selection_cb(), event_infc));
3246 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_CLASS)) 3246 if (eo_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
3247 eo_do(obj, eo_event_callback_array_del(_text_cb(), event_infc)); 3247 eo_do(obj, eo_event_callback_array_del(_text_cb(), event_infc));
3248} 3248}
3249 3249
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b5fd8c96b..c9714fd6c 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -422,7 +422,7 @@ _viewport_region_get(Evas_Object *obj)
422 parent = elm_widget_parent_get(obj); 422 parent = elm_widget_parent_get(obj);
423 while (parent) 423 while (parent)
424 { 424 {
425 if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_CLASS)) 425 if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
426 { 426 {
427 Eina_Rectangle *pr = eina_rectangle_new(0, 0, 0, 0); 427 Eina_Rectangle *pr = eina_rectangle_new(0, 0, 0, 0);
428 evas_object_geometry_get(parent, &pr->x, &pr->y, &pr->w, &pr->h); 428 evas_object_geometry_get(parent, &pr->x, &pr->y, &pr->w, &pr->h);
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 9a5fe75e2..4c25a2084 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -156,7 +156,7 @@ _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, void *pd EINA_UN
156 eo_do(obj, parent = eo_parent_get()); 156 eo_do(obj, parent = eo_parent_get());
157 if (!parent) return NULL; 157 if (!parent) return NULL;
158 158
159 return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS) ? parent : NULL; 159 return eo_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
160} 160}
161 161
162EOLIAN static void 162EOLIAN static void
@@ -250,7 +250,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, void *pd EINA_
250 250
251 EINA_ITERATOR_FOREACH(iter, chld) 251 EINA_ITERATOR_FOREACH(iter, chld)
252 { 252 {
253 if (eo_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 253 if (eo_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
254 children = eina_list_append(children, chld); 254 children = eina_list_append(children, chld);
255 } 255 }
256 eina_iterator_free(iter); 256 eina_iterator_free(iter);
diff --git a/src/lib/elm_interface_atspi_component.c b/src/lib/elm_interface_atspi_component.c
index 8817e012d..0f0f48a95 100644
--- a/src/lib/elm_interface_atspi_component.c
+++ b/src/lib/elm_interface_atspi_component.c
@@ -89,7 +89,7 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
89 EINA_LIST_FOREACH(objs, l, evobj) 89 EINA_LIST_FOREACH(objs, l, evobj)
90 { 90 {
91 // return first only, test if there is atspi interface for eo 91 // return first only, test if there is atspi interface for eo
92 if (eo_isa(evobj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 92 if (eo_isa(evobj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
93 { 93 {
94 ret = evobj; 94 ret = evobj;
95 break; 95 break;
diff --git a/src/lib/elm_interface_atspi_widget.c b/src/lib/elm_interface_atspi_widget.c
index 63276e14a..c524611b5 100644
--- a/src/lib/elm_interface_atspi_widget.c
+++ b/src/lib/elm_interface_atspi_widget.c
@@ -33,7 +33,7 @@ _on_focus_change(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
33EOLIAN void 33EOLIAN void
34_elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Widget_Data *pd) 34_elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Widget_Data *pd)
35{ 35{
36 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, eo_constructor()); 36 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, eo_constructor());
37 37
38 pd->role = ELM_ATSPI_ROLE_UNKNOWN; 38 pd->role = ELM_ATSPI_ROLE_UNKNOWN;
39 39
@@ -55,7 +55,7 @@ _elm_interface_atspi_widget_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Interfac
55 if (parent && !eo_destructed_is(parent)) 55 if (parent && !eo_destructed_is(parent))
56 elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj); 56 elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj);
57 57
58 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, eo_destructor()); 58 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, eo_destructor());
59} 59}
60 60
61EOLIAN static Eina_Bool 61EOLIAN static Eina_Bool
@@ -115,7 +115,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_children_get(Eo *obj
115 EINA_LIST_FOREACH(wd->subobjs, l, widget) 115 EINA_LIST_FOREACH(wd->subobjs, l, widget)
116 { 116 {
117 if (!elm_object_widget_check(widget)) continue; 117 if (!elm_object_widget_check(widget)) continue;
118 if (eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 118 if (eo_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
119 accs = eina_list_append(accs, widget); 119 accs = eina_list_append(accs, widget);
120 } 120 }
121 return accs; 121 return accs;
@@ -127,7 +127,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj
127 Elm_Atspi_State_Set states = 0; 127 Elm_Atspi_State_Set states = 0;
128 Evas *evas = NULL; 128 Evas *evas = NULL;
129 129
130 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_CLASS, states = elm_interface_atspi_accessible_state_set_get()); 130 eo_do_super(obj, ELM_INTERFACE_ATSPI_WIDGET_MIXIN, states = elm_interface_atspi_accessible_state_set_get());
131 131
132 if (evas_object_visible_get(obj)) 132 if (evas_object_visible_get(obj))
133 STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE); 133 STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE);
@@ -190,14 +190,14 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_relation_set_get(Eo *
190 Evas_Object *rel_obj; 190 Evas_Object *rel_obj;
191 191
192 rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_NEXT); 192 rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_NEXT);
193 if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 193 if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
194 { 194 {
195 rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_TO, rel_obj); 195 rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_TO, rel_obj);
196 list = eina_list_append(list, rel); 196 list = eina_list_append(list, rel);
197 } 197 }
198 198
199 rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_PREVIOUS); 199 rel_obj = elm_object_focus_next_object_get(obj, ELM_FOCUS_PREVIOUS);
200 if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_CLASS)) 200 if (eo_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
201 { 201 {
202 rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_FROM, rel_obj); 202 rel = _relation_new(ELM_ATSPI_RELATION_FLOWS_FROM, rel_obj);
203 list = eina_list_append(list, rel); 203 list = eina_list_append(list, rel);
diff --git a/src/lib/elm_interface_fileselector.h b/src/lib/elm_interface_fileselector.h
index defb7d6ad..31b2bded5 100644
--- a/src/lib/elm_interface_fileselector.h
+++ b/src/lib/elm_interface_fileselector.h
@@ -4,7 +4,7 @@
4#include "elm_interface_fileselector.eo.h" 4#include "elm_interface_fileselector.eo.h"
5 5
6#define ELM_FILESELECTOR_INTERFACE_CHECK(obj, ...) \ 6#define ELM_FILESELECTOR_INTERFACE_CHECK(obj, ...) \
7 if (EINA_UNLIKELY(!eo_isa(obj, ELM_INTERFACE_FILESELECTOR_CLASS))) \ 7 if (EINA_UNLIKELY(!eo_isa(obj, ELM_INTERFACE_FILESELECTOR_INTERFACE))) \
8 { \ 8 { \
9 ERR("The object (%p) doesn't implement the Elementary fileselector" \ 9 ERR("The object (%p) doesn't implement the Elementary fileselector" \
10 " interface", obj); \ 10 " interface", obj); \
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index c080d6e00..7a43d4cee 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -308,7 +308,7 @@ _elm_pan_class_constructor(Eo_Class *klass)
308/* pan smart object on top, scroller interface on bottom */ 308/* pan smart object on top, scroller interface on bottom */
309/* ============================================================ */ 309/* ============================================================ */
310 310
311#define MY_SCROLLABLE_INTERFACE ELM_INTERFACE_SCROLLABLE_CLASS 311#define MY_SCROLLABLE_INTERFACE ELM_INTERFACE_SCROLLABLE_MIXIN
312 312
313#define MY_SCROLLABLE_INTERFACE_NAME "Elm_Interface_Scrollable" 313#define MY_SCROLLABLE_INTERFACE_NAME "Elm_Interface_Scrollable"
314#define MY_SCROLLABLE_INTERFACE_NAME_LEGACY "elm_interface_scrollable" 314#define MY_SCROLLABLE_INTERFACE_NAME_LEGACY "elm_interface_scrollable"
diff --git a/src/lib/elm_interface_scrollable.h b/src/lib/elm_interface_scrollable.h
index d019c104a..25f50a14b 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -214,7 +214,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
214 214
215#define ELM_SCROLLABLE_CHECK(obj, ...) \ 215#define ELM_SCROLLABLE_CHECK(obj, ...) \
216 \ 216 \
217 if (!eo_isa(obj, ELM_INTERFACE_SCROLLABLE_CLASS)) \ 217 if (!eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN)) \
218 { \ 218 { \
219 ERR("The object (%p) doesn't implement the Elementary scrollable" \ 219 ERR("The object (%p) doesn't implement the Elementary scrollable" \
220 " interface", obj); \ 220 " interface", obj); \
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index f7e04f97b..b039011d6 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -80,7 +80,7 @@ _elm_scrollable_is(const Evas_Object *obj)
80{ 80{
81 INTERNAL_ENTRY EINA_FALSE; 81 INTERNAL_ENTRY EINA_FALSE;
82 return 82 return
83 eo_isa(obj, ELM_INTERFACE_SCROLLABLE_CLASS); 83 eo_isa(obj, ELM_INTERFACE_SCROLLABLE_MIXIN);
84} 84}
85 85
86void 86void