kimcinoo pushed a commit to branch master.
commit fb1bc461b7cd57f234cf57ca2849d7ed7f262762
Author: Shinwoo Kim <[email protected]>
Date: Wed Jul 31 12:53:04 2013 +0900
[access] use proper name _elm_access_info_get(); not
_elm_access_object_get(); to get access information
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/elc_multibuttonentry.c | 8 +++----
src/lib/elc_naviframe.c | 8 +++----
src/lib/elc_popup.c | 16 ++++++-------
src/lib/elm_access.c | 28 +++++++++++++---------
src/lib/elm_bubble.c | 4 ++--
src/lib/elm_button.c | 6 ++---
src/lib/elm_calendar.c | 16 ++++++-------
src/lib/elm_check.c | 6 ++---
src/lib/elm_clock.c | 22 ++++++++---------
src/lib/elm_colorselector.c | 4 ++--
src/lib/elm_datetime.c | 2 +-
src/lib/elm_dayselector.c | 2 +-
src/lib/elm_diskselector.c | 6 ++---
src/lib/elm_entry.c | 6 ++---
src/lib/elm_gengrid.c | 2 +-
src/lib/elm_genlist.c | 2 +-
src/lib/elm_index.c | 4 ++--
src/lib/elm_label.c | 4 ++--
src/lib/elm_list.c | 2 +-
src/lib/elm_panel.c | 4 ++--
src/lib/elm_progressbar.c | 6 ++---
src/lib/elm_radio.c | 6 ++---
src/lib/elm_segment_control.c | 2 +-
src/lib/elm_slider.c | 6 ++---
src/lib/elm_spinner.c | 6 ++---
src/lib/elm_toolbar.c | 2 +-
src/lib/elm_widget.c | 2 +-
src/lib/elm_widget.h | 4 +++-
.../datetime_input_ctxpopup.c | 4 ++--
31 files changed, 104 insertions(+), 91 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 954dd50..37b5535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1520,3 +1520,7 @@
* Flip : Fix the flip page to not flip on a direction if the direction
is disabled.
+
+2013-07-31 Shinwoo Kim
+
+ * Add _elm_access_object_get, deprecate _elm_access_info_get.
diff --git a/NEWS b/NEWS
index 54354b9..ab0d982 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,7 @@ Additions:
* Add the configuration thumbscroll_flick_distance_tolerance.
* Add elm_access_highlight_next_set, export elm_widget_focus_region_show
* File Selector : Support elm_object_part_text_set() for the ok, cancel
part to change the OK, Cancel button label.
+ * Add _elm_access_object_get, deprecate _elm_access_info_get
Improvements:
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index eda426d..7531b07 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -625,7 +625,7 @@ _access_multibuttonentry_label_register(Evas_Object *obj,
Eina_Bool is_access)
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, sd->label, "mbe.label");
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("multi button entry label"));
}
else
@@ -647,7 +647,7 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, item->button, "elm.btn.text");
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("multi button entry item"));
}
else
@@ -1552,9 +1552,9 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd,
va_list *list EINA_UNUSED)
// ACCESS
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("multi button entry"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("multi button entry"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
}
static void
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 21acdc4..f8b99ff 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -380,9 +380,9 @@ _access_obj_process(Elm_Naviframe_Item *it, Eina_Bool
is_access)
eo = elm_layout_edje_get(VIEW(it));
ao =_elm_access_edje_object_part_object_register(WIDGET(it), eo,
TITLE_ACCESS_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Title"));
- _elm_access_callback_set(_elm_access_object_get(ao),
+ _elm_access_callback_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, _access_info_cb, it);
/* to access title access object, any idea? */
((Elm_Widget_Item *)it)->access_obj = ao;
@@ -1197,7 +1197,7 @@ _item_new(Evas_Object *obj,
if (!elm_layout_text_get(prev_btn, NULL))
_elm_access_callback_set
- (_elm_access_object_get(prev_btn), ELM_ACCESS_INFO,
+ (_elm_access_info_get(prev_btn), ELM_ACCESS_INFO,
_access_prev_btn_info_cb, it);
}
@@ -1207,7 +1207,7 @@ _item_new(Evas_Object *obj,
if (!elm_layout_text_get(next_btn, NULL))
_elm_access_text_set
- (_elm_access_object_get(next_btn), ELM_ACCESS_INFO, E_("Next"));
+ (_elm_access_info_get(next_btn), ELM_ACCESS_INFO, E_("Next"));
}
_item_content_set(it, content);
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 74b2e32..84c1d28 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -260,9 +260,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, sd->title_text);
}
@@ -270,9 +270,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj));
}
}
@@ -878,10 +878,10 @@ _title_text_set(Evas_Object *obj,
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_TITLE_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Title"));
}
- _elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO,
text);
+ _elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
}
if (sd->title_text)
@@ -946,10 +946,10 @@ _content_text_set(Evas_Object *obj,
{
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, ACCESS_BODY_PART);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("Popup Body Text"));
}
- _elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO,
text);
+ _elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
}
end:
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index b7d84fa..6115b39 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -522,7 +522,7 @@ _access_highlight_next_get(Evas_Object *obj,
Elm_Focus_Direction dir)
{
if (ho)
{
- Elm_Access_Info *info = _elm_access_object_get(ho);
+ Elm_Access_Info *info = _elm_access_info_get(ho);
if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT && info->next)
target = info->next;
else if (type == ELM_ACCESS_ACTION_HIGHLIGHT_PREV && info->prev)
@@ -678,7 +678,7 @@ _elm_access_highlight_cycle(Evas_Object *obj,
Elm_Focus_Direction dir)
if (!ho) elm_widget_focus_cycle(obj, dir);
else if (!_access_action_callback_call(ho, type, NULL))
{
- Elm_Access_Info *info = _elm_access_object_get(ho);
+ Elm_Access_Info *info = _elm_access_info_get(ho);
Evas_Object *comming = NULL;
if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT)
{
@@ -772,11 +772,17 @@ _elm_access_say(const char *txt)
}
EAPI Elm_Access_Info *
-_elm_access_object_get(const Evas_Object *obj)
+_elm_access_info_get(const Evas_Object *obj)
{
return evas_object_data_get(obj, "_elm_access");
}
+EAPI Elm_Access_Info *
+_elm_access_object_get(const Evas_Object *obj)
+{
+ return _elm_access_info_get(obj);
+}
+
EAPI void
_elm_access_object_hilight(Evas_Object *obj)
{
@@ -1174,20 +1180,20 @@ elm_access_object_get(const Evas_Object *obj)
EAPI void
elm_access_info_set(Evas_Object *obj, int type, const char *text)
{
- _elm_access_text_set(_elm_access_object_get(obj), type, text);
+ _elm_access_text_set(_elm_access_info_get(obj), type, text);
}
EAPI char *
elm_access_info_get(const Evas_Object *obj, int type)
{
- return _elm_access_text_get(_elm_access_object_get(obj), type, obj);
+ return _elm_access_text_get(_elm_access_info_get(obj), type, obj);
}
EAPI void
elm_access_info_cb_set(Evas_Object *obj, int type,
Elm_Access_Info_Cb func, const void *data)
{
- _elm_access_callback_set(_elm_access_object_get(obj), type, func, data);
+ _elm_access_callback_set(_elm_access_info_get(obj), type, func, data);
}
EAPI void
@@ -1196,7 +1202,7 @@ elm_access_activate_cb_set(Evas_Object *obj,
{
Elm_Access_Info *ac;
- ac = _elm_access_object_get(obj);
+ ac = _elm_access_info_get(obj);
if (!ac) return;
ac->activate = func;
@@ -1310,7 +1316,7 @@ EAPI void
elm_access_external_info_set(Evas_Object *obj, const char *text)
{
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_CONTEXT_INFO, text);
+ (_elm_access_info_get(obj), ELM_ACCESS_CONTEXT_INFO, text);
}
EAPI char *
@@ -1318,7 +1324,7 @@ elm_access_external_info_get(const Evas_Object *obj)
{
Elm_Access_Info *ac;
- ac = _elm_access_object_get(obj);
+ ac = _elm_access_info_get(obj);
return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj);
}
@@ -1328,8 +1334,8 @@ elm_access_highlight_next_set(Evas_Object *obj,
Elm_Highlight_Direction dir, Eva
EINA_SAFETY_ON_FALSE_RETURN(obj);
EINA_SAFETY_ON_FALSE_RETURN(next);
- Elm_Access_Info *info = _elm_access_object_get(obj);
- Elm_Access_Info *info_next = _elm_access_object_get(next);
+ Elm_Access_Info *info = _elm_access_info_get(obj);
+ Elm_Access_Info *info_next = _elm_access_info_get(next);
if (!info || !info_next)
{
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index de6d044..c200037 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -214,9 +214,9 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
// ACCESS
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Bubble"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Bubble"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 6522cf1..9dada59 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -304,11 +304,11 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED,
va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Button"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Button"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index ae35f2c..dd9a3a3 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -269,9 +269,9 @@ _access_calendar_item_register(Evas_Object *obj)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), pname);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("calendar item"));
- _elm_access_callback_set(_elm_access_object_get(ao),
+ _elm_access_callback_set(_elm_access_info_get(ao),
ELM_ACCESS_INFO, _access_info_cb, NULL);
snprintf(day_s, sizeof(day_s), "%i", day++);
@@ -295,32 +295,32 @@ _access_calendar_spinner_register(Evas_Object *obj)
sd->dec_btn_month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "left_bt");
- ai = _elm_access_object_get(sd->dec_btn_month_access);
+ ai = _elm_access_info_get(sd->dec_btn_month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement month
button"));
sd->dec_btn_year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "left_bt_year");
- ai = _elm_access_object_get(sd->dec_btn_year_access);
+ ai = _elm_access_info_get(sd->dec_btn_year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement year
button"));
sd->inc_btn_month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "right_bt");
- ai = _elm_access_object_get(sd->inc_btn_month_access);
+ ai = _elm_access_info_get(sd->inc_btn_month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment month
button"));
sd->inc_btn_year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "right_bt_year");
- ai = _elm_access_object_get(sd->inc_btn_year_access);
+ ai = _elm_access_info_get(sd->inc_btn_year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment year
button"));
sd->month_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "text_month");
- ai = _elm_access_object_get(sd->month_access);
+ ai = _elm_access_info_get(sd->month_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar month"));
sd->year_access = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "year_text");
- ai = _elm_access_object_get(sd->year_access);
+ ai = _elm_access_info_get(sd->year_access);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year"));
po = (Evas_Object *)edje_object_part_object_get
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index c6ef5a3..7fc6af0 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -305,11 +305,11 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED,
va_list *list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Check"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 3b91263..946e5c2 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -247,20 +247,20 @@ _access_time_register(Evas_Object *obj, Eina_Bool
is_access)
eina_strbuf_append_printf(strbuf,
"clock increment button for %s", digit);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
_elm_access_activate_callback_set
- (_elm_access_object_get(ao), _access_activate_cb, obj);
+ (_elm_access_info_get(ao), _access_activate_cb, obj);
/* decrement button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->digit[i], "access.b");
eina_strbuf_replace(strbuf, "increment", "decrement", 1);
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
_elm_access_activate_callback_set
- (_elm_access_object_get(ao), _access_activate_cb, obj);
+ (_elm_access_info_get(ao), _access_activate_cb, obj);
eina_strbuf_free(strbuf);
@@ -296,18 +296,18 @@ _access_time_register(Evas_Object *obj, Eina_Bool
is_access)
/* increment button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->am_pm_obj, "access.t");
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("clock increment button for am,pm"));
_elm_access_activate_callback_set
- (_elm_access_object_get(ao), _access_activate_cb, obj);
+ (_elm_access_info_get(ao), _access_activate_cb, obj);
/* decrement button */
ao = _elm_access_edje_object_part_object_register
(obj, sd->am_pm_obj, "access.b");
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("clock decrement button for am,pm"));
_elm_access_activate_callback_set
- (_elm_access_object_get(ao), _access_activate_cb, obj);
+ (_elm_access_info_get(ao), _access_activate_cb, obj);
edje_object_signal_emit
(sd->am_pm_obj, "elm,state,access,edit,on", "elm");
@@ -690,12 +690,12 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Clock"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Clock"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
evas_object_propagate_events_set(obj, EINA_FALSE);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index cec99af..25e2727 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -878,7 +878,7 @@ _access_colorbar_register(Evas_Object *obj,
const char* colorbar_type = NULL;
ao = _elm_access_edje_object_part_object_register(obj, cd->colorbar, part);
- ai = _elm_access_object_get(ao);
+ ai = _elm_access_info_get(ao);
switch (cd->color_type)
{
@@ -1351,7 +1351,7 @@ _access_widget_item_register(Elm_Color_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("color selector palette
item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index f5cbd86..b0d7d6c 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -841,7 +841,7 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
priv->access_obj = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access");
- ai = _elm_access_object_get(priv->access_obj);
+ ai = _elm_access_info_get(priv->access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time");
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
}
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index ffede0a..066c7a5 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -417,7 +417,7 @@ _items_create(Evas_Object *obj)
elm_layout_content_set(obj, buf, chk);
// XXX: ACCESS
- _elm_access_text_set(_elm_access_object_get(chk),
+ _elm_access_text_set(_elm_access_info_get(chk),
ELM_ACCESS_TYPE, E_("day selector item"));
}
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 82ba815..4ad0af8 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -667,13 +667,13 @@ _item_new(Evas_Object *obj,
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- _elm_access_text_set(_elm_access_object_get(it->base.access_obj),
+ _elm_access_text_set(_elm_access_info_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("diskselector item"));
- _elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
+ _elm_access_callback_set(_elm_access_info_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_on_highlight_hook_set(
- _elm_access_object_get(it->base.access_obj),
_access_on_highlight_cb,
+ _elm_access_info_get(it->base.access_obj), _access_on_highlight_cb,
it);
}
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 0385138..2a663e6 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3118,11 +3118,11 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
// access
_elm_access_object_register(obj, priv->entry_edje);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Entry"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Entry"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 1cd7480..a8dde7e 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -719,7 +719,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Gengrid Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 7b0ac61..c83a272 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -1408,7 +1408,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index d46d154..d924b64 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -99,7 +99,7 @@ _access_index_register(Evas_Object *obj)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access");
_elm_access_text_set
- (_elm_access_object_get(ao), ELM_ACCESS_TYPE, E_("Index"));
+ (_elm_access_info_get(ao), ELM_ACCESS_TYPE, E_("Index"));
}
static char *
@@ -124,7 +124,7 @@ _access_widget_item_register(Elm_Index_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Index Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 97b9667..b6bf1f7 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -404,9 +404,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Label"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Label"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
CRITICAL("Failed to set layout!");
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 5b8610c..be353ba 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1553,7 +1553,7 @@ _access_widget_item_register(Elm_List_Item *it, Eina_Bool
is_access)
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index addeb54..848f8d4 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -113,10 +113,10 @@ _orient_set_do(Evas_Object *obj)
Evas_Object *ao;
ao = _elm_access_edje_object_part_object_register
(obj, wd->resize_obj, "btn_icon");
- _elm_access_text_set(_elm_access_object_get(ao),
+ _elm_access_text_set(_elm_access_info_get(ao),
ELM_ACCESS_TYPE, E_("panel button"));
_elm_access_callback_set
- (_elm_access_object_get(ao), ELM_ACCESS_STATE, _access_state_cb,
obj);
+ (_elm_access_info_get(ao), ELM_ACCESS_STATE, _access_state_cb, obj);
}
}
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index d28fa68..4adb438 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -271,11 +271,11 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("progressbar"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("progressbar"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
}
static void
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 2beb27f..e606b73 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -290,11 +290,11 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
}
static void
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 81e564a..642ada4 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -549,7 +549,7 @@ _access_widget_item_register(Elm_Segment_Item *it)
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Segment Control Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 097f0f2..ddf6412 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -859,11 +859,11 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
_elm_access_object_register(obj, wd->resize_obj);
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("slider"));
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("slider"));
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
evas_object_smart_changed(obj);
}
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 0afd7ac..060f443 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -610,7 +610,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool
is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), increment_part);
- ai = _elm_access_object_get(ao);
+ ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE,
E_("spinner increment button"));
_elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@@ -619,7 +619,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool
is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), decrement_part);
- ai = _elm_access_object_get(ao);
+ ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE,
E_("spinner decrement button"));
_elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@@ -628,7 +628,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool
is_access)
ao = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), "access_text");
- ai = _elm_access_object_get(ao);
+ ai = _elm_access_info_get(ao);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, obj);
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 7dece02..19e63b7 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2064,7 +2064,7 @@ _access_widget_item_register(Elm_Toolbar_Item *it)
{
Elm_Access_Info *ai;
_elm_access_widget_item_register((Elm_Widget_Item *)it);
- ai = _elm_access_object_get(it->base.access_obj);
+ ai = _elm_access_info_get(it->base.access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item"));
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 293f1e2..d2262b2 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2646,7 +2646,7 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
if (_elm_config->access_mode)
{
Elm_Access_Info *ac;
- ac= _elm_access_object_get(obj);
+ ac= _elm_access_info_get(obj);
if (!ac) return;
}
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 388b2db..594580f 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -515,7 +515,7 @@ EAPI void
_elm_access_callback_set(Elm_Access_Info *ac, int type, El
EAPI char *_elm_access_text_get(const Elm_Access_Info *ac, int
type, const Evas_Object *obj); /* this is ok it actually returns a strduped
string - it's meant to! */
EAPI void _elm_access_read(Elm_Access_Info *ac, int type, const
Evas_Object *obj);
EAPI void _elm_access_say(const char *txt);
-EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj);
+EAPI Elm_Access_Info *_elm_access_info_get(const Evas_Object *obj);
EAPI void _elm_access_object_hilight(Evas_Object *obj);
EAPI void _elm_access_object_unhilight(Evas_Object *obj);
EAPI void _elm_access_object_hilight_disable(Evas *e);
@@ -532,6 +532,8 @@ EAPI void
_elm_access_activate_callback_set(Elm_Access_Info *ac, Elm
EAPI void _elm_access_highlight_object_activate(Evas_Object *obj,
Elm_Activate act);
EAPI void _elm_access_highlight_cycle(Evas_Object *obj,
Elm_Focus_Direction dir);
+EINA_DEPRECATED EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object
*obj);
+
#define ELM_PREFS_DATA_MAGIC 0xe1f5da7a
/**< put this as the first member in your widget item struct */
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index d5595ed..838440a 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -247,9 +247,9 @@ _access_set(Evas_Object *obj, Elm_Datetime_Field_Type
field_type)
}
_elm_access_text_set
- (_elm_access_object_get(obj), ELM_ACCESS_TYPE, type);
+ (_elm_access_info_get(obj), ELM_ACCESS_TYPE, type);
_elm_access_callback_set
- (_elm_access_object_get(obj), ELM_ACCESS_STATE, NULL, NULL);
+ (_elm_access_info_get(obj), ELM_ACCESS_STATE, NULL, NULL);
}
// module fucns for the specific module type
--
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
