diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index c6b31d2539..01ebd8db01 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -142,7 +142,6 @@ elc_popup.h \ elc_popup_eo.h \ elc_popup_legacy.h \ elc_popup_common.h \ -elm_access.h \ elm_actionslider.h \ elm_actionslider_eo.h \ elm_actionslider_legacy.h \ diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c index 5c215d5547..9242dc3174 100644 --- a/legacy/elementary/src/lib/elm_access.c +++ b/legacy/elementary/src/lib/elm_access.c @@ -1212,44 +1212,44 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_type_set(MY_CLASS_NAME)); } -EAPI Evas_Object * +Evas_Object * elm_access_object_register(Evas_Object *obj, Evas_Object *parent) { return _access_object_register(obj, parent); } -EAPI void +void elm_access_object_unregister(Evas_Object *obj) { _access_object_unregister(obj); } -EAPI Evas_Object * +Evas_Object * elm_access_object_get(const Evas_Object *obj) { return evas_object_data_get(obj, "_part_access_obj"); } -EAPI void +void elm_access_info_set(Evas_Object *obj, int type, const char *text) { _elm_access_text_set(_elm_access_info_get(obj), type, text); } -EAPI char * +char * elm_access_info_get(const Evas_Object *obj, int type) { return _elm_access_text_get(_elm_access_info_get(obj), type, obj); } -EAPI void +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_info_get(obj), type, func, data); } -EAPI void +void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb func, void *data) { @@ -1262,7 +1262,7 @@ elm_access_activate_cb_set(Evas_Object *obj, ac->activate_data = data; } -EAPI void +void elm_access_say(const char *text) { if (!text) return; @@ -1270,13 +1270,13 @@ elm_access_say(const char *text) _elm_access_say(text); } -EAPI void +void elm_access_highlight_set(Evas_Object* obj) { _elm_access_highlight_set(obj); } -EAPI Eina_Bool +Eina_Bool elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, Elm_Access_Action_Info *action_info) { Evas *evas; @@ -1347,7 +1347,7 @@ elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, Elm_Acces return EINA_TRUE; } -EAPI void +void elm_access_action_cb_set(Evas_Object *obj, const Elm_Access_Action_Type type, const Elm_Access_Action_Cb cb, const void *data) { Action_Info *a; @@ -1363,6 +1363,7 @@ elm_access_action_cb_set(Evas_Object *obj, const Elm_Access_Action_Type type, co a->fn[type].cb = cb; a->fn[type].user_data = (void *)data; } + EAPI void elm_access_external_info_set(Evas_Object *obj, const char *text) { @@ -1379,7 +1380,7 @@ elm_access_external_info_get(const Evas_Object *obj) return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj); } -EAPI void +void elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Evas_Object *next) { EINA_SAFETY_ON_FALSE_RETURN(obj); diff --git a/legacy/elementary/src/lib/elm_access.h b/legacy/elementary/src/lib/elm_access.h index 8125b369b1..3b30128ab4 100644 --- a/legacy/elementary/src/lib/elm_access.h +++ b/legacy/elementary/src/lib/elm_access.h @@ -24,7 +24,7 @@ enum _Elm_Access_Info_Type }; /** - * @since 1.8 + * @since 1.9 * @typedef Elm_Access_Info_Type */ typedef enum _Elm_Access_Info_Type Elm_Access_Info_Type; @@ -54,7 +54,7 @@ enum _Elm_Access_Action_Type }; /** - * @since 1.8 + * @since 1.9 * @typedef Elm_Access_Action_Type */ typedef enum _Elm_Access_Action_Type Elm_Access_Action_Type; @@ -73,7 +73,7 @@ struct _Elm_Access_Action_Info }; /** - * @since 1.8 + * @since 1.9 * @typedef Elm_Access_Action_Info */ typedef struct _Elm_Access_Action_Info Elm_Access_Action_Info; @@ -86,13 +86,13 @@ enum _Elm_Highlight_Direction }; /** - * @since 1.8 + * @since 1.9 * @typedef Elm_Highlight_Direction */ typedef enum _Elm_Highlight_Direction Elm_Highlight_Direction; /** - * @since 1.8 + * @since 1.9 * @typedef Elm_Access_Action_Cb * * User callback to make access object do specific action @@ -110,7 +110,7 @@ typedef void (*Elm_Access_Activate_Cb)(void *data, Evas_Object *part_obj, Elm_Ob /** * @brief Register evas object as an accessible object. - * @since 1.8 + * @since 1.9 * * @param obj The evas object to register as an accessible object. * @param parent The elementary object which is used for creating @@ -118,32 +118,32 @@ typedef void (*Elm_Access_Activate_Cb)(void *data, Evas_Object *part_obj, Elm_Ob * * @ingroup Access */ -EAPI Evas_Object *elm_access_object_register(Evas_Object *obj, Evas_Object *parent); +Evas_Object *elm_access_object_register(Evas_Object *obj, Evas_Object *parent); /** * @brief Unregister accessible object. - * @since 1.8 + * @since 1.9 * * @param obj The Evas object to unregister accessible object. * * @ingroup Access */ -EAPI void elm_access_object_unregister(Evas_Object *obj); +void elm_access_object_unregister(Evas_Object *obj); /** * @brief Get an accessible object of the evas object. - * @since 1.8 + * @since 1.9 * * @param obj The evas object. * @return Accessible object of the evas object or NULL for any error * * @ingroup Access */ -EAPI Evas_Object *elm_access_object_get(const Evas_Object *obj); +Evas_Object *elm_access_object_get(const Evas_Object *obj); /** * @brief Set text to give information for specific type. - * @since 1.8 + * @since 1.9 * * @param obj Accessible object. * @param type The type of content that will be read @@ -152,11 +152,11 @@ EAPI Evas_Object *elm_access_object_get(const Evas_Object *obj); * @see elm_access_info_cb_set * @ingroup Access */ -EAPI void elm_access_info_set(Evas_Object *obj, int type, const char *text); +void elm_access_info_set(Evas_Object *obj, int type, const char *text); /** * @brief Set text to give information for specific type. - * @since 1.8 + * @since 1.9 * * @param obj Accessible object. * @param type The type of content that will be read @@ -164,11 +164,11 @@ EAPI void elm_access_info_set(Evas_Object *obj, int type, const char *text); * @see elm_access_info_cb_set * @ingroup Access */ -EAPI char *elm_access_info_get(const Evas_Object *obj, int type); +char *elm_access_info_get(const Evas_Object *obj, int type); /** * @brief Set content callback to give information for specific type. - * @since 1.8 + * @since 1.9 * * @param obj Accessible object. * @param type The type of content that will be read @@ -185,11 +185,11 @@ EAPI char *elm_access_info_get(const Evas_Object *obj, int type); * * @ingroup Access */ -EAPI void elm_access_info_cb_set(Evas_Object *obj, int type, Elm_Access_Info_Cb func, const void *data); +void elm_access_info_cb_set(Evas_Object *obj, int type, Elm_Access_Info_Cb func, const void *data); /** * @brief Set activate callback to activate highlight object. - * @since 1.8 + * @since 1.9 * * @param obj Accessible object. * @param func The function to be called when the activate gesture is detected @@ -197,11 +197,11 @@ EAPI void elm_access_info_cb_set(Evas_Object *obj, int type, Elm_Access_Info_Cb * * @ingroup Access */ -EAPI void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb func, void *data); +void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb func, void *data); /** * @brief Read out text information directly. - * @since 1.8 + * @since 1.9 * * @param text The text information that will be read * @@ -209,11 +209,11 @@ EAPI void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb fu * * @ingroup Access */ -EAPI void elm_access_say(const char *text); +void elm_access_say(const char *text); /** * @brief Give the highlight to the object directly. - * @since 1.8 + * @since 1.9 * * @param obj The object that will have the highlight and its information be read. * @@ -222,11 +222,11 @@ EAPI void elm_access_say(const char *text); * @see elm_access_object_get * @ingroup Access */ -EAPI void elm_access_highlight_set(Evas_Object* obj); +void elm_access_highlight_set(Evas_Object* obj); /** * @brief Do the accessibility action base on given object. - * @since 1.8 + * @since 1.9 * * @param obj The object that could be an any object. it would be useful to use a container widget. * @param type The type of accessibility action. @@ -240,11 +240,11 @@ EAPI void elm_access_highlight_set(Evas_Object* obj); * * @ingroup Access */ -EAPI Eina_Bool elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, Elm_Access_Action_Info *action_info); +Eina_Bool elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, Elm_Access_Action_Info *action_info); /** * @brief Set a callback function to a given accessibility action type - * @since 1.8 + * @since 1.9 * * @param obj The object to attach a callback to * @param type The type of accessibility action. @@ -253,11 +253,11 @@ EAPI Eina_Bool elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type * * @ingroup Access */ -EAPI void elm_access_action_cb_set(Evas_Object *obj, const Elm_Access_Action_Type type, const Elm_Access_Action_Cb cb, const void *data); +void elm_access_action_cb_set(Evas_Object *obj, const Elm_Access_Action_Type type, const Elm_Access_Action_Cb cb, const void *data); /** * @brief Set the next access object for highlight. - * @since 1.8 + * @since 1.9 * * @param obj The object is previous access object of next for hilight. * @param dir Access direction same as Focus direction @@ -270,5 +270,5 @@ EAPI void elm_access_action_cb_set(Evas_Object *obj, const Elm_Access_Action_Typ * * @ingroup Access */ -EAPI void +void elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Evas_Object *next);