diff options
Diffstat (limited to 'src/lib/evas/canvas')
99 files changed, 1534 insertions, 1558 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c index cea6d86a13..60e44a3d72 100644 --- a/src/lib/evas/canvas/efl_canvas_event_grabber.c +++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c @@ -400,7 +400,7 @@ _efl_canvas_event_grabber_freeze_when_visible_get(const Eo *eo_obj EINA_UNUSED, return pd->freeze; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_event_grabber_add(Evas *eo_e) { eo_e = evas_find(eo_e); diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.c index ff954ebf02..e6437c8a18 100644 --- a/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.c @@ -1,11 +1,11 @@ -EAPI void +EVAS_API void evas_object_event_grabber_freeze_when_visible_set(Efl_Canvas_Event_Grabber *obj, Eina_Bool set) { efl_canvas_event_grabber_freeze_when_visible_set(obj, set); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_event_grabber_freeze_when_visible_get(const Efl_Canvas_Event_Grabber *obj) { return efl_canvas_event_grabber_freeze_when_visible_get(obj); diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h index 3f1b146196..a226f63ad0 100644 --- a/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_event_grabber_eo.legacy.h @@ -25,7 +25,7 @@ typedef Eo Efl_Canvas_Event_Grabber; * * @ingroup Evas_Object_Event_Grabber_Group */ -EAPI void evas_object_event_grabber_freeze_when_visible_set(Efl_Canvas_Event_Grabber *obj, Eina_Bool set); +EVAS_API void evas_object_event_grabber_freeze_when_visible_set(Efl_Canvas_Event_Grabber *obj, Eina_Bool set); /** * @brief Stops the grabber from updating its internal stacking order while @@ -39,6 +39,6 @@ EAPI void evas_object_event_grabber_freeze_when_visible_set(Efl_Canvas_Event_Gra * * @ingroup Evas_Object_Event_Grabber_Group */ -EAPI Eina_Bool evas_object_event_grabber_freeze_when_visible_get(const Efl_Canvas_Event_Grabber *obj); +EVAS_API Eina_Bool evas_object_event_grabber_freeze_when_visible_get(const Efl_Canvas_Event_Grabber *obj); #endif diff --git a/src/lib/evas/canvas/efl_canvas_group_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_group_eo.legacy.c index 1144c0a22b..3d0fea1308 100644 --- a/src/lib/evas/canvas/efl_canvas_group_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_group_eo.legacy.c @@ -1,29 +1,29 @@ -EAPI void +EVAS_API void evas_object_smart_need_recalculate_set(Efl_Canvas_Group *obj, Eina_Bool value) { efl_canvas_group_need_recalculate_set(obj, value); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_smart_need_recalculate_get(const Efl_Canvas_Group *obj) { return efl_canvas_group_need_recalculate_get(obj); } -EAPI void +EVAS_API void evas_object_smart_changed(Efl_Canvas_Group *obj) { efl_canvas_group_change(obj); } -EAPI void +EVAS_API void evas_object_smart_calculate(Efl_Canvas_Group *obj) { efl_canvas_group_calculate(obj); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_object_smart_iterator_new(const Efl_Canvas_Group *obj) { return efl_canvas_group_members_iterate(obj); diff --git a/src/lib/evas/canvas/efl_canvas_group_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_group_eo.legacy.h index f8f45ed286..fed6d7f8a5 100644 --- a/src/lib/evas/canvas/efl_canvas_group_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_group_eo.legacy.h @@ -34,7 +34,7 @@ typedef Eo Efl_Canvas_Group; * * @ingroup Evas_Object_Smart_Group */ -EAPI void evas_object_smart_need_recalculate_set(Efl_Canvas_Group *obj, Eina_Bool value); +EVAS_API void evas_object_smart_need_recalculate_set(Efl_Canvas_Group *obj, Eina_Bool value); /** * @brief Indicates that the group's layout needs to be recalculated. @@ -57,7 +57,7 @@ EAPI void evas_object_smart_need_recalculate_set(Efl_Canvas_Group *obj, Eina_Boo * * @ingroup Evas_Object_Smart_Group */ -EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Efl_Canvas_Group *obj); +EVAS_API Eina_Bool evas_object_smart_need_recalculate_get(const Efl_Canvas_Group *obj); /** * @brief Marks the object as dirty. @@ -69,7 +69,7 @@ EAPI Eina_Bool evas_object_smart_need_recalculate_get(const Efl_Canvas_Group *ob * * @ingroup Evas_Object_Smart_Group */ -EAPI void evas_object_smart_changed(Efl_Canvas_Group *obj); +EVAS_API void evas_object_smart_changed(Efl_Canvas_Group *obj); /** * @brief Triggers an immediate recalculation of this object's geometry. @@ -79,7 +79,7 @@ EAPI void evas_object_smart_changed(Efl_Canvas_Group *obj); * * @ingroup Evas_Object_Smart_Group */ -EAPI void evas_object_smart_calculate(Efl_Canvas_Group *obj); +EVAS_API void evas_object_smart_calculate(Efl_Canvas_Group *obj); /** * @brief Returns an iterator over the children of this object, which are @@ -95,7 +95,7 @@ EAPI void evas_object_smart_calculate(Efl_Canvas_Group *obj); * * @ingroup Evas_Object_Smart_Group */ -EAPI Eina_Iterator *evas_object_smart_iterator_new(const Efl_Canvas_Group *obj); +EVAS_API Eina_Iterator *evas_object_smart_iterator_new(const Efl_Canvas_Group *obj); diff --git a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c index 853f7da502..2d9a5a0682 100644 --- a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.c @@ -1,102 +1,102 @@ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_Pointer_Mode pointer_mode) { return efl_canvas_object_pointer_mode_set(obj, (Efl_Input_Object_Pointer_Mode)pointer_mode); } -EAPI Evas_Object_Pointer_Mode +EVAS_API Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj) { return (Evas_Object_Pointer_Mode)efl_canvas_object_pointer_mode_get(obj); } -EAPI void +EVAS_API void evas_object_clip_set(Efl_Canvas_Object *obj, Efl_Canvas_Object *clipper) { efl_canvas_object_clipper_set(obj, clipper); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_clip_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_clipper_get(obj); } -EAPI void +EVAS_API void evas_object_repeat_events_set(Efl_Canvas_Object *obj, Eina_Bool repeat) { efl_canvas_object_repeat_events_set(obj, repeat); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_repeat_events_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_repeat_events_get(obj); } -EAPI void +EVAS_API void evas_object_focus_set(Efl_Canvas_Object *obj, Eina_Bool focus) { efl_canvas_object_key_focus_set(obj, focus); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_focus_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_key_focus_get(obj); } -EAPI void +EVAS_API void evas_object_precise_is_inside_set(Efl_Canvas_Object *obj, Eina_Bool precise) { efl_canvas_object_precise_is_inside_set(obj, precise); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_precise_is_inside_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_precise_is_inside_get(obj); } -EAPI void +EVAS_API void evas_object_propagate_events_set(Efl_Canvas_Object *obj, Eina_Bool propagate) { efl_canvas_object_propagate_events_set(obj, propagate); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_propagate_events_get(const Efl_Canvas_Object *obj) { if (!efl_isa(obj, EFL_CANVAS_OBJECT_CLASS)) return EINA_FALSE; return efl_canvas_object_propagate_events_get(obj); } -EAPI void +EVAS_API void evas_object_pass_events_set(Efl_Canvas_Object *obj, Eina_Bool pass) { efl_canvas_object_pass_events_set(obj, pass); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_pass_events_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_pass_events_get(obj); } -EAPI void +EVAS_API void evas_object_anti_alias_set(Efl_Canvas_Object *obj, Eina_Bool anti_alias) { efl_canvas_object_anti_alias_set(obj, anti_alias); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_anti_alias_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_anti_alias_get(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_smart_parent_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_render_parent_get(obj); @@ -134,13 +134,13 @@ _efl_text_bidirectional_type_to_evas_bidi_direction_type(Efl_Text_Bidirectional_ #undef CONVERT_TYPE } -EAPI void +EVAS_API void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_Direction dir) { efl_canvas_object_paragraph_direction_set(obj, _evas_bidi_direction_type_to_efl_text_bidirectional_type(dir)); } -EAPI Evas_BiDi_Direction +EVAS_API Evas_BiDi_Direction evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj) { return _efl_text_bidirectional_type_to_evas_bidi_direction_type(efl_canvas_object_paragraph_direction_get(obj)); diff --git a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h index b8cd72787f..c78d89d48c 100644 --- a/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_object_eo.legacy.h @@ -58,7 +58,7 @@ typedef struct _Efl_Event_Animator_Tick * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_Pointer_Mode pointer_mode); +EVAS_API Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_Pointer_Mode pointer_mode); /** * @brief Low-level pointer behaviour. @@ -85,7 +85,7 @@ EAPI Eina_Bool evas_object_pointer_mode_set(Efl_Canvas_Object *obj, Evas_Object_ * * @ingroup Evas_Object_Group */ -EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj); +EVAS_API Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Object *obj); @@ -131,7 +131,7 @@ EAPI Evas_Object_Pointer_Mode evas_object_pointer_mode_get(const Efl_Canvas_Obje * * @ingroup Evas_Object_Group */ -EAPI void evas_object_clip_set(Efl_Canvas_Object *obj, Efl_Canvas_Object *clip) EINA_ARG_NONNULL(2); +EVAS_API void evas_object_clip_set(Efl_Canvas_Object *obj, Efl_Canvas_Object *clip) EINA_ARG_NONNULL(2); /** * @brief Get the object clipping @c obj (if any). @@ -146,7 +146,7 @@ EAPI void evas_object_clip_set(Efl_Canvas_Object *obj, Efl_Canvas_Object *clip) * * @ingroup Evas_Object_Group */ -EAPI Efl_Canvas_Object *evas_object_clip_get(const Efl_Canvas_Object *obj); +EVAS_API Efl_Canvas_Object *evas_object_clip_get(const Efl_Canvas_Object *obj); /** * @brief Set whether an Evas object is to repeat events. @@ -164,7 +164,7 @@ EAPI Efl_Canvas_Object *evas_object_clip_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_repeat_events_set(Efl_Canvas_Object *obj, Eina_Bool repeat); +EVAS_API void evas_object_repeat_events_set(Efl_Canvas_Object *obj, Eina_Bool repeat); /** * @brief Determine whether an object is set to repeat events. @@ -175,7 +175,7 @@ EAPI void evas_object_repeat_events_set(Efl_Canvas_Object *obj, Eina_Bool repeat * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_repeat_events_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_repeat_events_get(const Efl_Canvas_Object *obj); /** * @brief Indicates that this object is the keyboard event receiver on its @@ -194,7 +194,7 @@ EAPI Eina_Bool evas_object_repeat_events_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_focus_set(Efl_Canvas_Object *obj, Eina_Bool focus); +EVAS_API void evas_object_focus_set(Efl_Canvas_Object *obj, Eina_Bool focus); /** * @brief Indicates that this object is the keyboard event receiver on its @@ -214,7 +214,7 @@ EAPI void evas_object_focus_set(Efl_Canvas_Object *obj, Eina_Bool focus); * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_focus_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_focus_get(const Efl_Canvas_Object *obj); @@ -237,7 +237,7 @@ EAPI Eina_Bool evas_object_focus_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_precise_is_inside_set(Efl_Canvas_Object *obj, Eina_Bool precise); +EVAS_API void evas_object_precise_is_inside_set(Efl_Canvas_Object *obj, Eina_Bool precise); /** * @brief Determine whether an object is set to use precise point collision @@ -250,7 +250,7 @@ EAPI void evas_object_precise_is_inside_set(Efl_Canvas_Object *obj, Eina_Bool pr * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_precise_is_inside_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_precise_is_inside_get(const Efl_Canvas_Object *obj); /** * @brief Set whether events on a smart object's member should be propagated up @@ -271,7 +271,7 @@ EAPI Eina_Bool evas_object_precise_is_inside_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_propagate_events_set(Efl_Canvas_Object *obj, Eina_Bool propagate); +EVAS_API void evas_object_propagate_events_set(Efl_Canvas_Object *obj, Eina_Bool propagate); /** * @brief Retrieve whether an Evas object is set to propagate events. @@ -285,7 +285,7 @@ EAPI void evas_object_propagate_events_set(Efl_Canvas_Object *obj, Eina_Bool pro * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_propagate_events_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_propagate_events_get(const Efl_Canvas_Object *obj); /** * @brief Set whether an Evas object is to pass (ignore) events. @@ -304,7 +304,7 @@ EAPI Eina_Bool evas_object_propagate_events_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_pass_events_set(Efl_Canvas_Object *obj, Eina_Bool pass); +EVAS_API void evas_object_pass_events_set(Efl_Canvas_Object *obj, Eina_Bool pass); /** * @brief Determine whether an object is set to pass (ignore) events. @@ -318,7 +318,7 @@ EAPI void evas_object_pass_events_set(Efl_Canvas_Object *obj, Eina_Bool pass); * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_pass_events_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_pass_events_get(const Efl_Canvas_Object *obj); /** * @brief Sets whether or not the given Evas object is to be drawn @@ -330,7 +330,7 @@ EAPI Eina_Bool evas_object_pass_events_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI void evas_object_anti_alias_set(Efl_Canvas_Object *obj, Eina_Bool anti_alias); +EVAS_API void evas_object_anti_alias_set(Efl_Canvas_Object *obj, Eina_Bool anti_alias); /** * @brief Retrieves whether or not the given Evas object is to be drawn @@ -342,7 +342,7 @@ EAPI void evas_object_anti_alias_set(Efl_Canvas_Object *obj, Eina_Bool anti_alia * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_anti_alias_get(const Efl_Canvas_Object *obj); +EVAS_API Eina_Bool evas_object_anti_alias_get(const Efl_Canvas_Object *obj); /** @@ -360,7 +360,7 @@ EAPI Eina_Bool evas_object_anti_alias_get(const Efl_Canvas_Object *obj); * * @ingroup Evas_Object_Group */ -EAPI Efl_Canvas_Object *evas_object_smart_parent_get(const Efl_Canvas_Object *obj); +EVAS_API Efl_Canvas_Object *evas_object_smart_parent_get(const Efl_Canvas_Object *obj); /** * @brief This handles text paragraph direction of the given object. Even if @@ -373,7 +373,7 @@ EAPI Efl_Canvas_Object *evas_object_smart_parent_get(const Efl_Canvas_Object *ob * * @ingroup Evas_Object_Group */ -EAPI void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_Direction dir); +EVAS_API void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_Direction dir); /** * @brief This handles text paragraph direction of the given object. Even if @@ -387,7 +387,7 @@ EAPI void evas_object_paragraph_direction_set(Efl_Canvas_Object *obj, Evas_BiDi_ * * @ingroup Evas_Object_Group */ -EAPI Evas_BiDi_Direction evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj); +EVAS_API Evas_BiDi_Direction evas_object_paragraph_direction_get(const Efl_Canvas_Object *obj); /** * @brief Test if any object is clipped by @c obj. @@ -400,7 +400,7 @@ EAPI Evas_BiDi_Direction evas_object_paragraph_direction_get(const Efl_Canvas_Ob * * @ingroup Evas_Object_Group */ -EAPI Eina_Bool evas_object_clipees_has(const Efl_Canvas_Object *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Bool evas_object_clipees_has(const Efl_Canvas_Object *obj) EINA_WARN_UNUSED_RESULT; diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c index 26c9341695..d5a63999aa 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c @@ -1,41 +1,41 @@ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end) { return evas_textblock_cursor_visible_range_get(start, end); } -EAPI void +EVAS_API void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b) { efl_canvas_textblock_style_insets_get(obj, l, r, t, b); } -EAPI void +EVAS_API void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim) { efl_canvas_textblock_bidi_delimiters_set(obj, delim); } -EAPI const char * +EVAS_API const char * evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj) { return efl_canvas_textblock_bidi_delimiters_get(obj); } -EAPI void +EVAS_API void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode) { efl_canvas_textblock_newline_as_paragraph_separator_set(obj, mode); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj) { return efl_canvas_textblock_newline_as_paragraph_separator_get(obj); } -EAPI void +EVAS_API void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h) { Eina_Size2D size; @@ -44,7 +44,7 @@ evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w if (h) *h = size.h; } -EAPI void +EVAS_API void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h) { Eina_Size2D size; @@ -53,19 +53,19 @@ evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, i if (h) *h = size.h; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs) { return efl_canvas_textblock_obstacle_add(obj, eo_obs); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs) { return efl_canvas_textblock_obstacle_del(obj, eo_obs); } -EAPI void +EVAS_API void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj) { efl_canvas_textblock_obstacles_update(obj); diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h index 7ac64b29ed..e4b903ec78 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h @@ -33,7 +33,7 @@ typedef Efl_Canvas_Textblock Efl_Canvas_Text; * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end); +EVAS_API Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end); /** * @brief Gets the left, right, top and bottom insets of the text. @@ -50,7 +50,7 @@ EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom); +EVAS_API void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom); /** * @brief BiDi delimiters are used for in-paragraph separation of bidi @@ -65,7 +65,7 @@ EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim); +EVAS_API void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim); /** * @brief BiDi delimiters are used for in-paragraph separation of bidi @@ -80,7 +80,7 @@ EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, c * * @ingroup Evas_Object_Textblock_Group */ -EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj); +EVAS_API const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj); /** * @brief When @c true, newline character will behave as a paragraph separator. @@ -92,7 +92,7 @@ EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode); +EVAS_API void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode); /** * @brief When @c true, newline character will behave as a paragraph separator. @@ -105,7 +105,7 @@ EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Ei * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj); +EVAS_API Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj); @@ -134,7 +134,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblo * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height); +EVAS_API void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height); /** * @brief The native width and height. @@ -162,7 +162,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *o * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height); +EVAS_API void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height); @@ -184,7 +184,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); +EVAS_API Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); /** * @brief Removes @c eo_obs from observation during text layout. @@ -198,7 +198,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); +EVAS_API Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); /** * @brief Triggers for relayout due to obstacles' state change. @@ -217,7 +217,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj); +EVAS_API void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj); #endif diff --git a/src/lib/evas/canvas/efl_canvas_textblock_internal.h b/src/lib/evas/canvas/efl_canvas_textblock_internal.h index 98bc7f6ac6..3db3e7ab17 100644 --- a/src/lib/evas/canvas/efl_canvas_textblock_internal.h +++ b/src/lib/evas/canvas/efl_canvas_textblock_internal.h @@ -257,31 +257,7 @@ _evas_textblock_annotations_node_format_remove(Evas_Object *o, Evas_Object_Textb void _evas_textblock_relayout_if_needed(Evas_Object *o); -#ifdef EAPI -# undef EAPI -#endif - -#ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include <evas_api.h> /** * Internally sets given text_object into cursor object. @@ -290,7 +266,7 @@ _evas_textblock_relayout_if_needed(Evas_Object *o); * @param canvas_text_obj the canvas text object, where cursor methods will take effect. * @param text_obj the text_object that user can get using cursor text_object property. */ -EAPI void efl_text_cursor_object_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj); +EVAS_API void efl_text_cursor_object_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj); /** @@ -298,7 +274,7 @@ EAPI void efl_text_cursor_object_text_object_set(Eo *cursor, Eo *canvas_text_obj * * @param parent the parent of the cursor object. */ -EAPI Eo* efl_text_cursor_object_create(Eo *parent); +EVAS_API Eo* efl_text_cursor_object_create(Eo *parent); /** @@ -307,7 +283,7 @@ EAPI Eo* efl_text_cursor_object_create(Eo *parent); * @param obj the cursor object. * @param handle the text cursor handle. */ -EAPI void efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle); +EVAS_API void efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle); /** * Internally gets cursor handle(legacy textblock cursor) from cursor object. @@ -315,9 +291,6 @@ EAPI void efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *han * @param obj the cursor object. * @return the internal text cursor handle. */ -EAPI Efl_Text_Cursor_Handle *efl_text_cursor_object_handle_get(const Eo *obj); - -#undef EAPI -#define EAPI +EVAS_API Efl_Text_Cursor_Handle *efl_text_cursor_object_handle_get(const Eo *obj); #endif//#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.c b/src/lib/evas/canvas/efl_canvas_vg_container.c index 7dea6945ef..4ba1d96bfe 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_container.c +++ b/src/lib/evas/canvas/efl_canvas_vg_container.c @@ -527,7 +527,7 @@ efl_canvas_vg_container_blend_buffer_clear(Efl_VG *obj EINA_UNUSED, Efl_Canvas_V cd->blend.buffer = NULL; } -EAPI Evas_Vg_Container * +EVAS_API Evas_Vg_Container * evas_vg_container_add(Evas_Object *parent) { /* Warn it because the usage has been changed. diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c index 170a6668f0..5928ac17ee 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c @@ -1,11 +1,11 @@ -EAPI Evas_Vg_Node * +EVAS_API Evas_Vg_Node * evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name) { return efl_canvas_vg_container_child_get(obj, name); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_vg_container_children_get(Evas_Vg_Container *obj) { return efl_canvas_vg_container_children_get(obj); diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h index 8a4cde36d6..235462a987 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h @@ -26,7 +26,7 @@ typedef Eo Evas_Vg_Container; * * @ingroup Evas_Vg_Container_Group */ -EAPI Evas_Vg_Node *evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name); +EVAS_API Evas_Vg_Node *evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name); /** * @brief Get all children of container. @@ -39,6 +39,6 @@ EAPI Evas_Vg_Node *evas_vg_container_child_get(Evas_Vg_Container *obj, const cha * * @ingroup Evas_Vg_Container_Group */ -EAPI Eina_Iterator *evas_vg_container_children_get(Evas_Vg_Container *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Iterator *evas_vg_container_children_get(Evas_Vg_Container *obj) EINA_WARN_UNUSED_RESULT; #endif diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.c b/src/lib/evas/canvas/efl_canvas_vg_gradient.c index c9d8a8b724..d254888631 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_gradient.c +++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.c @@ -117,25 +117,25 @@ _efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Gra return cn; } -EAPI void +EVAS_API void evas_vg_gradient_stop_set(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop *colors, unsigned int length) { efl_gfx_gradient_stop_set(obj, (const Efl_Gfx_Gradient_Stop *)colors, length); } -EAPI void +EVAS_API void evas_vg_gradient_stop_get(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop **colors, unsigned int *length) { efl_gfx_gradient_stop_get(obj, (const Efl_Gfx_Gradient_Stop **)colors, length); } -EAPI void +EVAS_API void evas_vg_gradient_spread_set(Evas_Vg_Gradient *obj, Evas_Vg_Gradient_Spread s) { efl_gfx_gradient_spread_set(obj, (Efl_Gfx_Gradient_Spread)s); } -EAPI Evas_Vg_Gradient_Spread +EVAS_API Evas_Vg_Gradient_Spread evas_vg_gradient_spread_get(Evas_Vg_Gradient *obj) { return (Evas_Vg_Gradient_Spread)efl_gfx_gradient_spread_get(obj); diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c index bd8ccebf36..01ba7cf843 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c @@ -171,31 +171,31 @@ _efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas return cn; } -EAPI void +EVAS_API void evas_vg_gradient_linear_start_set(Evas_Vg_Gradient_Linear *obj, double x, double y) { efl_gfx_gradient_linear_start_set(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_linear_start_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y) { efl_gfx_gradient_linear_start_get(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_linear_end_set(Evas_Vg_Gradient_Linear *obj, double x, double y) { efl_gfx_gradient_linear_end_set(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_linear_end_get(Evas_Vg_Gradient_Linear *obj, double *x, double *y) { efl_gfx_gradient_linear_end_get(obj, x, y); } -EAPI Evas_Vg_Gradient_Linear * +EVAS_API Evas_Vg_Gradient_Linear * evas_vg_gradient_linear_add(Evas_Vg_Container *parent) { return efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, parent); diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c index 263428630b..d35f35f92f 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c @@ -193,43 +193,43 @@ _efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas return cn; } -EAPI void +EVAS_API void evas_vg_gradient_radial_center_set(Evas_Vg_Gradient_Radial *obj, double x, double y) { efl_gfx_gradient_radial_center_set(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_radial_center_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y) { efl_gfx_gradient_radial_center_get(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_radial_radius_set(Evas_Vg_Gradient_Radial *obj, double r) { efl_gfx_gradient_radial_radius_set(obj, r); } -EAPI double +EVAS_API double evas_vg_gradient_radial_radius_get(Evas_Vg_Gradient_Radial *obj) { return efl_gfx_gradient_radial_radius_get(obj); } -EAPI void +EVAS_API void evas_vg_gradient_radial_focal_set(Evas_Vg_Gradient_Radial *obj, double x, double y) { efl_gfx_gradient_radial_focal_set(obj, x, y); } -EAPI void +EVAS_API void evas_vg_gradient_radial_focal_get(Evas_Vg_Gradient_Radial *obj, double *x, double *y) { efl_gfx_gradient_radial_focal_get(obj, x, y); } -EAPI Evas_Vg_Gradient_Radial* +EVAS_API Evas_Vg_Gradient_Radial* evas_vg_gradient_radial_add(Evas_Vg_Container *parent) { return efl_add(EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS, parent); diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c b/src/lib/evas/canvas/efl_canvas_vg_node.c index f2bead512f..342c2106a3 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_node.c +++ b/src/lib/evas/canvas/efl_canvas_vg_node.c @@ -709,31 +709,31 @@ _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Da return node; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj) { return efl_gfx_entity_visible_get(obj); } -EAPI void +EVAS_API void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v) { efl_gfx_entity_visible_set(obj, v); } -EAPI void +EVAS_API void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a) { efl_gfx_color_get(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a) { efl_gfx_color_set(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h) { Eina_Rect r; @@ -746,32 +746,32 @@ evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h) } /* deprecated */ -EAPI void +EVAS_API void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h) { efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y)); efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h)); } -EAPI void +EVAS_API void evas_vg_node_stack_below(Evas_Vg_Node *obj, Eo *below) { efl_gfx_stack_below(obj, below); } -EAPI void +EVAS_API void evas_vg_node_stack_above(Evas_Vg_Node *obj, Eo *above) { efl_gfx_stack_above(obj, above); } -EAPI void +EVAS_API void evas_vg_node_raise(Evas_Vg_Node *obj) { efl_gfx_stack_raise_to_top(obj); } -EAPI void +EVAS_API void evas_vg_node_lower(Evas_Vg_Node *obj) { efl_gfx_stack_lower_to_bottom(obj); diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c index e6d520ca44..89e615ccf0 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c @@ -1,29 +1,29 @@ -EAPI void +EVAS_API void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m) { efl_canvas_vg_node_transformation_set(obj, m); } -EAPI const Eina_Matrix3 * +EVAS_API const Eina_Matrix3 * evas_vg_node_transformation_get(const Evas_Vg_Node *obj) { return efl_canvas_vg_node_transformation_get(obj); } -EAPI void +EVAS_API void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y) { efl_canvas_vg_node_origin_set(obj, x, y); } -EAPI void +EVAS_API void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y) { efl_canvas_vg_node_origin_get(obj, x, y); } -EAPI void +EVAS_API void evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op EINA_UNUSED) { efl_canvas_vg_node_comp_method_set(obj, mask, 0); diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h index 556103540e..14681b077d 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h @@ -31,7 +31,7 @@ typedef Eo Evas_Vg_Node; * * @ingroup Evas_Vg_Node_Group */ -EAPI void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m); +EVAS_API void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m); /** * @brief Gets the transformation matrix used for this node object. @@ -43,7 +43,7 @@ EAPI void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 * * @ingroup Evas_Vg_Node_Group */ -EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Evas_Vg_Node *obj); +EVAS_API const Eina_Matrix3 *evas_vg_node_transformation_get(const Evas_Vg_Node *obj); /** * @brief Sets the origin position of the node object. @@ -58,7 +58,7 @@ EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Evas_Vg_Node *obj * * @ingroup Evas_Vg_Node_Group */ -EAPI void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y); +EVAS_API void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y); /** * @brief Gets the origin position of the node object. @@ -71,7 +71,7 @@ EAPI void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y); * * @ingroup Evas_Vg_Node_Group */ -EAPI void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y); +EVAS_API void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y); /** * @brief Set Mask Node to this renderer @@ -84,6 +84,6 @@ EAPI void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y) * * @ingroup Evas_Vg_Node_Group */ -EAPI void evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op); +EVAS_API void evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op); #endif diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c index 5317c375a6..16d29b43e4 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object.c +++ b/src/lib/evas/canvas/efl_canvas_vg_object.c @@ -1081,7 +1081,7 @@ _efl_canvas_vg_object_default_size_get(const Eo *eo_obj EINA_UNUSED, } /* the actual api call to add a vector graphic object */ -EAPI Eo * +EVAS_API Eo * evas_object_vg_add(Evas *e) { e = evas_find(e); @@ -1090,31 +1090,31 @@ evas_object_vg_add(Evas *e) return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } -EAPI int +EVAS_API int evas_object_vg_animated_frame_get(const Evas_Object *obj) { return efl_gfx_frame_controller_frame_get(obj); } -EAPI double +EVAS_API double evas_object_vg_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int frame_num) { return efl_gfx_frame_controller_frame_duration_get(obj, start_frame, frame_num); } -EAPI int +EVAS_API int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) { return efl_gfx_frame_controller_frame_count_get(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_index) { return efl_gfx_frame_controller_frame_set(obj, frame_index); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const char *key) { return efl_file_simple_load(obj, file, key); @@ -1152,13 +1152,13 @@ _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(Efl_Canvas_Vg_Fil return EVAS_OBJECT_VG_FILL_MODE_NONE; } -EAPI void +EVAS_API void evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode fill_mode) { efl_canvas_vg_object_fill_mode_set(obj, _evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(fill_mode)); } -EAPI Evas_Object_Vg_Fill_Mode +EVAS_API Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object *obj) { return _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(efl_canvas_vg_object_fill_mode_get(obj)); diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c index 14a9595c12..58770b39aa 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c @@ -1,35 +1,35 @@ -EAPI void +EVAS_API void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox) { efl_canvas_vg_object_viewbox_set(obj, viewbox); } -EAPI Eina_Rect +EVAS_API Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj) { return efl_canvas_vg_object_viewbox_get(obj); } -EAPI void +EVAS_API void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double align_y) { efl_canvas_vg_object_viewbox_align_set(obj, align_x, align_y); } -EAPI void +EVAS_API void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x, double *align_y) { efl_canvas_vg_object_viewbox_align_get(obj, align_x, align_y); } -EAPI void +EVAS_API void evas_object_vg_root_node_set(Evas_Object *obj, Efl_Canvas_Vg_Node *root) { efl_canvas_vg_object_root_node_set(obj, root); } -EAPI Efl_Canvas_Vg_Node * +EVAS_API Efl_Canvas_Vg_Node * evas_object_vg_root_node_get(const Evas_Object *obj) { return efl_canvas_vg_object_root_node_get(obj); diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h index 40f49af66e..fdbe083bd3 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h @@ -43,7 +43,7 @@ typedef enum * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode fill_mode); +EVAS_API void evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode fill_mode); /** * @brief Control how the viewbox is mapped to the vg canvas's viewport. @@ -55,7 +55,7 @@ EAPI void evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mod * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object *obj); +EVAS_API Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object *obj); /** * @brief Sets the viewbox for the evas vg canvas. viewbox if set should be @@ -67,7 +67,7 @@ EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object *ob * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox); +EVAS_API void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox); /** * @brief Get the current viewbox from the evas_object_vg @@ -79,7 +79,7 @@ EAPI void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox); * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj); +EVAS_API Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj); /** * @brief Control how the viewbox is positioned inside the viewport. @@ -91,7 +91,7 @@ EAPI Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj); * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double align_y); +EVAS_API void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double align_y); /** * @brief Control how the viewbox is positioned inside the viewport. @@ -103,7 +103,7 @@ EAPI void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, dou * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x, double *align_y); +EVAS_API void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x, double *align_y); /** * @brief Set the root node of the evas_object_vg. @@ -119,7 +119,7 @@ EAPI void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align * @since 1.24 * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_root_node_set(Evas_Object *obj, Evas_Vg_Node *root); +EVAS_API void evas_object_vg_root_node_set(Evas_Object *obj, Evas_Vg_Node *root); /** * @brief Get the root node of the evas_object_vg. @@ -132,6 +132,6 @@ EAPI void evas_object_vg_root_node_set(Evas_Object *obj, Evas_Vg_Node *root); * * @ingroup Evas_Object_Vg_Group */ -EAPI Evas_Vg_Node *evas_object_vg_root_node_get(const Evas_Object *obj); +EVAS_API Evas_Vg_Node *evas_object_vg_root_node_get(const Evas_Object *obj); #endif diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c b/src/lib/evas/canvas/efl_canvas_vg_shape.c index ce833708ed..a698e9aeae 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape.c +++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c @@ -235,227 +235,227 @@ _efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Shape_ return node; } -EAPI double +EVAS_API double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj) { return efl_gfx_shape_stroke_scale_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s) { efl_gfx_shape_stroke_scale_set(obj, s); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int *a) { efl_gfx_shape_stroke_color_get(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b, int a) { efl_gfx_shape_stroke_color_set(obj, r, g, b, a); efl_canvas_vg_node_change(obj); } -EAPI double +EVAS_API double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj) { return efl_gfx_shape_stroke_width_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w) { efl_gfx_shape_stroke_width_set(obj, w); efl_canvas_vg_node_change(obj); } -EAPI double +EVAS_API double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj) { return efl_gfx_shape_stroke_location_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered) { efl_gfx_shape_stroke_location_set(obj, centered); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash, unsigned int *length) { efl_gfx_shape_stroke_dash_get(obj, (const Efl_Gfx_Dash **)dash, length); } -EAPI void +EVAS_API void evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash, unsigned int length) { efl_gfx_shape_stroke_dash_set(obj, (const Efl_Gfx_Dash *)dash, length); efl_canvas_vg_node_change(obj); } -EAPI Evas_Vg_Cap +EVAS_API Evas_Vg_Cap evas_vg_shape_stroke_cap_get(Evas_Vg_Shape *obj) { return (Evas_Vg_Cap)efl_gfx_shape_stroke_cap_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_cap_set(Evas_Vg_Shape *obj, Evas_Vg_Cap c) { efl_gfx_shape_stroke_cap_set(obj, (Efl_Gfx_Cap)c); efl_canvas_vg_node_change(obj); } -EAPI Evas_Vg_Join +EVAS_API Evas_Vg_Join evas_vg_shape_stroke_join_get(Evas_Vg_Shape *obj) { return (Evas_Vg_Join)efl_gfx_shape_stroke_join_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_join_set(Evas_Vg_Shape *obj, Evas_Vg_Join j) { efl_gfx_shape_stroke_join_set(obj, (Efl_Gfx_Join)j); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_path_set(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command *op, const double *points) { efl_gfx_path_set(obj, (const Efl_Gfx_Path_Command *)op, points); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_path_get(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command **op, const double **points) { efl_gfx_path_get(obj, (const Efl_Gfx_Path_Command **)op, points); } -EAPI void +EVAS_API void evas_vg_shape_path_length_get(Evas_Vg_Shape *obj, unsigned int *commands, unsigned int *points) { efl_gfx_path_length_get(obj, commands, points); } -EAPI void +EVAS_API void evas_vg_shape_current_get(Evas_Vg_Shape *obj, double *x, double *y) { efl_gfx_path_current_get(obj, x, y); } -EAPI void +EVAS_API void evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double *y) { efl_gfx_path_current_ctrl_get(obj, x, y); } -EAPI void +EVAS_API void evas_vg_shape_dup(Evas_Vg_Shape *obj, Evas_Vg_Shape *dup_from) { efl_gfx_path_copy_from(obj, dup_from); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_reset(Evas_Vg_Shape *obj) { efl_gfx_path_reset(obj); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_move_to(Evas_Vg_Shape *obj, double x, double y) { efl_gfx_path_append_move_to(obj, x, y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_line_to(Evas_Vg_Shape *obj, double x, double y) { efl_gfx_path_append_line_to(obj, x, y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_quadratic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y) { efl_gfx_path_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_squadratic_to(Evas_Vg_Shape *obj, double x, double y) { efl_gfx_path_append_squadratic_to(obj, x, y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_cubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) { efl_gfx_path_append_cubic_to(obj, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1, x, y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_scubic_to(Evas_Vg_Shape *obj, double x, double y, double ctrl_x, double ctrl_y) { efl_gfx_path_append_scubic_to(obj, x, y, ctrl_x, ctrl_y); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_arc_to(Evas_Vg_Shape *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) { efl_gfx_path_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_arc(Evas_Vg_Shape *obj, double x, double y, double w, double h, double start_angle, double sweep_length) { efl_gfx_path_append_arc(obj, x, y, w, h, start_angle, sweep_length); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_close(Evas_Vg_Shape *obj) { efl_gfx_path_append_close(obj); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_circle(Evas_Vg_Shape *obj, double x, double y, double radius) { efl_gfx_path_append_circle(obj, x, y, radius); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_rect(Evas_Vg_Shape *obj, double x, double y, double w, double h, double rx, double ry) { efl_gfx_path_append_rect(obj, x, y, w, h, rx, ry); efl_canvas_vg_node_change(obj); } -EAPI void +EVAS_API void evas_vg_shape_append_svg_path(Evas_Vg_Shape *obj, const char *svg_path_data) { efl_gfx_path_append_svg_path(obj, svg_path_data); efl_canvas_vg_node_change(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const Evas_Vg_Shape *from, const Evas_Vg_Shape *to, double pos_map) { Eina_Bool ret = efl_gfx_path_interpolate(obj, from, to, pos_map); @@ -463,13 +463,13 @@ evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const Evas_Vg_Shape *from, const E return ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_vg_shape_equal_commands(Evas_Vg_Shape *obj, const Evas_Vg_Shape *with) { return efl_gfx_path_equal_commands(obj, with); } -EAPI Efl_Canvas_Vg_Shape* +EVAS_API Efl_Canvas_Vg_Shape* evas_vg_shape_add(Efl_Canvas_Vg_Node *parent) { /* Warn it because the usage has been changed. diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.c index 5630fe5f63..3dd3088a4c 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.c @@ -1,35 +1,35 @@ -EAPI void +EVAS_API void evas_vg_shape_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *f) { efl_canvas_vg_shape_fill_set(obj, f); } -EAPI Efl_Canvas_Vg_Node * +EVAS_API Efl_Canvas_Vg_Node * evas_vg_shape_fill_get(const Efl_Canvas_Vg_Shape *obj) { return efl_canvas_vg_shape_fill_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *f) { efl_canvas_vg_shape_stroke_fill_set(obj, f); } -EAPI Efl_Canvas_Vg_Node * +EVAS_API Efl_Canvas_Vg_Node * evas_vg_shape_stroke_fill_get(const Efl_Canvas_Vg_Shape *obj) { return efl_canvas_vg_shape_stroke_fill_get(obj); } -EAPI void +EVAS_API void evas_vg_shape_stroke_marker_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node *m) { efl_canvas_vg_shape_stroke_marker_set(obj, m); } -EAPI Efl_Canvas_Vg_Node * +EVAS_API Efl_Canvas_Vg_Node * evas_vg_shape_stroke_marker_get(const Efl_Canvas_Vg_Shape *obj) { return efl_canvas_vg_shape_stroke_marker_get(obj); diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h index cae5357996..51612b7a12 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h @@ -28,7 +28,7 @@ typedef Eo Evas_Vg_Shape; * * @ingroup Evas_Vg_Shape_Group */ -EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); +EVAS_API void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); /** * @brief Fill of the shape object. @@ -40,7 +40,7 @@ EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); * * @ingroup Evas_Vg_Shape_Group */ -EAPI Evas_Vg_Node *evas_vg_shape_fill_get(const Evas_Vg_Shape *obj); +EVAS_API Evas_Vg_Node *evas_vg_shape_fill_get(const Evas_Vg_Shape *obj); /** * @brief Stroke fill of the shape object. @@ -52,7 +52,7 @@ EAPI Evas_Vg_Node *evas_vg_shape_fill_get(const Evas_Vg_Shape *obj); * * @ingroup Evas_Vg_Shape_Group */ -EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); +EVAS_API void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); /** * @brief Stroke fill of the shape object. @@ -64,7 +64,7 @@ EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f); * * @ingroup Evas_Vg_Shape_Group */ -EAPI Evas_Vg_Node *evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj); +EVAS_API Evas_Vg_Node *evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj); /** * @brief Stroke marker of the shape object @@ -76,7 +76,7 @@ EAPI Evas_Vg_Node *evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj); * * @ingroup Evas_Vg_Shape_Group */ -EAPI void evas_vg_shape_stroke_marker_set(Evas_Vg_Shape *obj, Evas_Vg_Node *m); +EVAS_API void evas_vg_shape_stroke_marker_set(Evas_Vg_Shape *obj, Evas_Vg_Node *m); /** * @brief Stroke marker of the shape object @@ -88,6 +88,6 @@ EAPI void evas_vg_shape_stroke_marker_set(Evas_Vg_Shape *obj, Evas_Vg_Node *m); * * @ingroup Evas_Vg_Shape_Group */ -EAPI Evas_Vg_Node *evas_vg_shape_stroke_marker_get(const Evas_Vg_Shape *obj); +EVAS_API Evas_Vg_Node *evas_vg_shape_stroke_marker_get(const Evas_Vg_Shape *obj); #endif diff --git a/src/lib/evas/canvas/efl_gfx_vg_value_provider.c b/src/lib/evas/canvas/efl_gfx_vg_value_provider.c index c9fc15b3fb..b22232a6f4 100644 --- a/src/lib/evas/canvas/efl_gfx_vg_value_provider.c +++ b/src/lib/evas/canvas/efl_gfx_vg_value_provider.c @@ -60,7 +60,7 @@ _efl_gfx_vg_value_provider_transform_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_V return pd->m; } -EOAPI void +EVAS_API EVAS_API_WEAK void _efl_gfx_vg_value_provider_fill_color_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd, int r, int g, int b, int a) { pd->flag = pd->flag | EFL_GFX_VG_VALUE_PROVIDER_FLAGS_FILL_COLOR; @@ -71,7 +71,7 @@ _efl_gfx_vg_value_provider_fill_color_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_ pd->fill.a = a; } -EOAPI void +EVAS_API EVAS_API_WEAK void _efl_gfx_vg_value_provider_fill_color_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd, int *r, int *g, int *b, int *a) { if (r) *r = pd->fill.r; @@ -80,7 +80,7 @@ _efl_gfx_vg_value_provider_fill_color_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_ if (a) *a = pd->fill.a; } -EOAPI void +EVAS_API EVAS_API_WEAK void _efl_gfx_vg_value_provider_stroke_color_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd, int r, int g, int b, int a) { pd->flag = pd->flag | EFL_GFX_VG_VALUE_PROVIDER_FLAGS_STROKE_COLOR; @@ -91,7 +91,7 @@ _efl_gfx_vg_value_provider_stroke_color_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Valu pd->stroke.a = a; } -EOAPI void +EVAS_API EVAS_API_WEAK void _efl_gfx_vg_value_provider_stroke_color_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd, int *r, int *g, int *b, int *a) { if (r) *r = pd->stroke.r; @@ -100,7 +100,7 @@ _efl_gfx_vg_value_provider_stroke_color_get(const Eo *obj EINA_UNUSED, Efl_Gfx_V if (a) *a = pd->stroke.a; } -EOAPI void +EVAS_API EVAS_API_WEAK void _efl_gfx_vg_value_provider_stroke_width_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd, double w) { if (w < 0) return ; @@ -109,13 +109,13 @@ _efl_gfx_vg_value_provider_stroke_width_set(Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Valu pd->stroke.width = w; } -EOAPI double +EVAS_API EVAS_API_WEAK double _efl_gfx_vg_value_provider_stroke_width_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd) { return pd->stroke.width; } -EOAPI Efl_Gfx_Vg_Value_Provider_Flags +EVAS_API EVAS_API_WEAK Efl_Gfx_Vg_Value_Provider_Flags _efl_gfx_vg_value_provider_updated_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Vg_Value_Provider_Data *pd) { return pd->flag; diff --git a/src/lib/evas/canvas/efl_input_device.c b/src/lib/evas/canvas/efl_input_device.c index 52eae92cbb..3b6f3599c9 100644 --- a/src/lib/evas/canvas/efl_input_device.c +++ b/src/lib/evas/canvas/efl_input_device.c @@ -255,7 +255,7 @@ _efl_input_device_children_get(const Eo *obj EINA_UNUSED, Efl_Input_Device_Data return pd->children; } -EOAPI EFL_FUNC_BODY_CONST(efl_input_device_children_get, const Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(efl_input_device_children_get, const Eina_List *, NULL); static Evas * _efl_input_device_evas_get(const Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd) @@ -263,7 +263,7 @@ _efl_input_device_evas_get(const Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd) return pd->evas; } -EOAPI EFL_FUNC_BODY_CONST(efl_input_device_evas_get, Evas *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(efl_input_device_evas_get, Evas *, NULL); static void _efl_input_device_evas_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Evas *e) @@ -271,7 +271,7 @@ _efl_input_device_evas_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Evas pd->evas = e; } -EOAPI EFL_VOID_FUNC_BODYV(efl_input_device_evas_set, EFL_FUNC_CALL(e), Evas *e); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_input_device_evas_set, EFL_FUNC_CALL(e), Evas *e); static Evas_Device_Subclass _efl_input_device_subclass_get(const Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd) @@ -279,7 +279,7 @@ _efl_input_device_subclass_get(const Eo *obj EINA_UNUSED, Efl_Input_Device_Data return pd->subclass; } -EOAPI EFL_FUNC_BODY_CONST(efl_input_device_subclass_get, Evas_Device_Subclass, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(efl_input_device_subclass_get, Evas_Device_Subclass, 0); static void _efl_input_device_subclass_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, @@ -288,7 +288,7 @@ _efl_input_device_subclass_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, pd->subclass = sub_clas; } -EOAPI EFL_VOID_FUNC_BODYV(efl_input_device_subclass_set, EFL_FUNC_CALL(sub_clas), Evas_Device_Subclass sub_clas); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_input_device_subclass_set, EFL_FUNC_CALL(sub_clas), Evas_Device_Subclass sub_clas); static void _grab_del(void *data) @@ -306,7 +306,7 @@ _efl_input_device_grab_register(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, eina_hash_add(pd->grabs, &grab, pdata); } -EOAPI EFL_VOID_FUNC_BODYV(efl_input_device_grab_register, EFL_FUNC_CALL(grab, pdata), +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_input_device_grab_register, EFL_FUNC_CALL(grab, pdata), Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata); static void @@ -316,7 +316,7 @@ _efl_input_device_grab_unregister(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd eina_hash_del(pd->grabs, &grab, pdata); } -EOAPI EFL_VOID_FUNC_BODYV(efl_input_device_grab_unregister, EFL_FUNC_CALL(grab, pdata), +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_input_device_grab_unregister, EFL_FUNC_CALL(grab, pdata), Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata); #define EFL_INPUT_DEVICE_EXTRA_OPS \ diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c index 90bddde143..f839127015 100644 --- a/src/lib/evas/canvas/efl_input_event.c +++ b/src/lib/evas/canvas/efl_input_event.c @@ -133,7 +133,7 @@ efl_input_event_instance_clean(Eo *klass) /* Internal EO APIs */ -EOAPI EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL) +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(efl_input_legacy_info_get, void *, NULL) #define EFL_INPUT_EVENT_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, NULL) diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c index cb154a0017..9a65e88fbf 100644 --- a/src/lib/evas/canvas/efl_input_focus.c +++ b/src/lib/evas/canvas/efl_input_focus.c @@ -97,7 +97,7 @@ _efl_input_focus_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Focus_Data *pd } -EOAPI Eo* +EVAS_API EVAS_API_WEAK Eo* efl_input_focus_instance_get(Efl_Object *owner, void **priv) { Efl_Input_Focus_Data *ev; diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c index b5ad65b644..926a2f5fe4 100644 --- a/src/lib/evas/canvas/efl_input_hold.c +++ b/src/lib/evas/canvas/efl_input_hold.c @@ -80,7 +80,7 @@ _efl_input_hold_efl_object_destructor(Eo *obj, Efl_Input_Hold_Data *pd) } -EOAPI Eo* +EVAS_API EVAS_API_WEAK Eo* efl_input_hold_instance_get(Efl_Object *owner, void **priv) { Efl_Input_Event *evt = efl_input_event_instance_get(EFL_INPUT_HOLD_CLASS, owner);; diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c index 79c833ccda..24dfd21d6d 100644 --- a/src/lib/evas/canvas/efl_input_key.c +++ b/src/lib/evas/canvas/efl_input_key.c @@ -9,7 +9,7 @@ #define MY_CLASS EFL_INPUT_KEY_CLASS -EOAPI Eo* +EVAS_API EVAS_API_WEAK Eo* efl_input_key_instance_get(Efl_Object *owner, void **priv) { Efl_Input_Key_Data *ev; diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c index 33cb80ce68..f0e11fd959 100644 --- a/src/lib/evas/canvas/efl_input_pointer.c +++ b/src/lib/evas/canvas/efl_input_pointer.c @@ -21,7 +21,7 @@ */ /* internal eo */ -EOAPI Eo* +EVAS_API EVAS_API_WEAK Eo* efl_input_pointer_instance_get(Efl_Object *owner, void **priv) { Efl_Input_Pointer_Data *ev; @@ -43,7 +43,7 @@ _efl_input_pointer_class_destructor(Efl_Class *klass) efl_input_event_instance_clean(klass); } -EAPI void +EVAS_API void efl_input_pointer_finalize(Efl_Input_Pointer *obj) { const Evas_Pointer_Data *pdata; diff --git a/src/lib/evas/canvas/efl_text_cursor_object.c b/src/lib/evas/canvas/efl_text_cursor_object.c index e15f12898f..070a2521af 100644 --- a/src/lib/evas/canvas/efl_text_cursor_object.c +++ b/src/lib/evas/canvas/efl_text_cursor_object.c @@ -417,7 +417,7 @@ _efl_text_cursor_object_range_delete(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object evas_textblock_cursor_range_delete(pd->handle, efl_text_cursor_object_handle_get(cur2)); } -EAPI void +EVAS_API void efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle) { Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); @@ -435,7 +435,7 @@ efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle) } } -EAPI Efl_Text_Cursor_Handle * +EVAS_API Efl_Text_Cursor_Handle * efl_text_cursor_object_handle_get(const Eo *obj) { Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c index 9e19c3d38d..9b9e6714e8 100644 --- a/src/lib/evas/canvas/evas_async_events.c +++ b/src/lib/evas/canvas/evas_async_events.c @@ -171,13 +171,13 @@ evas_async_events_shutdown(void) return _init_evas_event; } -EAPI int +EVAS_API int evas_async_events_fd_get(void) { return -1; } -EAPI int +EVAS_API int evas_async_events_process(void) { int count = 0; @@ -207,7 +207,7 @@ _evas_async_events_fd_blocking_set(Eina_Bool blocking) #endif } -EAPI int +EVAS_API int evas_async_events_process_blocking(void) { int ret; @@ -224,7 +224,7 @@ evas_async_events_process_blocking(void) return ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func) { Evas_Event_Async *ev; @@ -295,7 +295,7 @@ _evas_thread_main_loop_lock(void *target EINA_UNUSED, free(call); } -EAPI int +EVAS_API int evas_thread_main_loop_begin(void) { Evas_Safe_Call *order; @@ -334,7 +334,7 @@ evas_thread_main_loop_begin(void) return _thread_loop; } -EAPI int +EVAS_API int evas_thread_main_loop_end(void) { int current_id; diff --git a/src/lib/evas/canvas/evas_box_eo.c b/src/lib/evas/canvas/evas_box_eo.c index 80bcd33f89..5c2b39f08c 100644 --- a/src/lib/evas/canvas/evas_box_eo.c +++ b/src/lib/evas/canvas/evas_box_eo.c @@ -1,163 +1,163 @@ -EWAPI const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_ADDED = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_ADDED = EFL_EVENT_DESCRIPTION("child,added"); -EWAPI const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_REMOVED = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_REMOVED = EFL_EVENT_DESCRIPTION("child,removed"); void _evas_box_align_set(Eo *obj, Evas_Object_Box_Data *pd, double horizontal, double vertical); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_align_set, EFL_FUNC_CALL(horizontal, vertical), double horizontal, double vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_align_set, EFL_FUNC_CALL(horizontal, vertical), double horizontal, double vertical); void _evas_box_align_get(const Eo *obj, Evas_Object_Box_Data *pd, double *horizontal, double *vertical); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_box_align_get, EFL_FUNC_CALL(horizontal, vertical), double *horizontal, double *vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_box_align_get, EFL_FUNC_CALL(horizontal, vertical), double *horizontal, double *vertical); void _evas_box_padding_set(Eo *obj, Evas_Object_Box_Data *pd, int horizontal, int vertical); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_padding_set, EFL_FUNC_CALL(horizontal, vertical), int horizontal, int vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_padding_set, EFL_FUNC_CALL(horizontal, vertical), int horizontal, int vertical); void _evas_box_padding_get(const Eo *obj, Evas_Object_Box_Data *pd, int *horizontal, int *vertical); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_box_padding_get, EFL_FUNC_CALL(horizontal, vertical), int *horizontal, int *vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_box_padding_get, EFL_FUNC_CALL(horizontal, vertical), int *horizontal, int *vertical); void _evas_box_layout_set(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_set, EFL_FUNC_CALL(cb, data, free_data), Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_set, EFL_FUNC_CALL(cb, data, free_data), Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data); void _evas_box_layout_horizontal(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); void _evas_box_layout_vertical(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); void _evas_box_layout_homogeneous_max_size_horizontal(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_max_size_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_max_size_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); Efl_Canvas_Object *_evas_box_internal_remove(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_remove, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_remove, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); void _evas_box_layout_flow_vertical(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_flow_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_flow_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); void _evas_box_internal_option_free(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Option *opt); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_internal_option_free, EFL_FUNC_CALL(opt), Evas_Object_Box_Option *opt); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_internal_option_free, EFL_FUNC_CALL(opt), Evas_Object_Box_Option *opt); Evas_Object_Box_Option *_evas_box_insert_after(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); -EOAPI EFL_FUNC_BODYV(evas_obj_box_insert_after, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_insert_after, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); Eina_Bool _evas_box_remove_all(Eo *obj, Evas_Object_Box_Data *pd, Eina_Bool clear); -EOAPI EFL_FUNC_BODYV(evas_obj_box_remove_all, Eina_Bool, 0, EFL_FUNC_CALL(clear), Eina_Bool clear); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_remove_all, Eina_Bool, 0, EFL_FUNC_CALL(clear), Eina_Bool clear); Eina_Iterator *_evas_box_iterator_new(const Eo *obj, Evas_Object_Box_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_box_iterator_new, Eina_Iterator *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_box_iterator_new, Eina_Iterator *, NULL); Efl_Canvas_Object *_evas_box_add_to(Eo *obj, Evas_Object_Box_Data *pd); -EOAPI EFL_FUNC_BODY(evas_obj_box_add_to, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_obj_box_add_to, Efl_Canvas_Object *, NULL); Evas_Object_Box_Option *_evas_box_append(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_append, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_append, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); int _evas_box_option_property_id_get(const Eo *obj, Evas_Object_Box_Data *pd, const char *name); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_id_get, int, 0, EFL_FUNC_CALL(name), const char *name); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_id_get, int, 0, EFL_FUNC_CALL(name), const char *name); Evas_Object_Box_Option *_evas_box_prepend(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_prepend, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_prepend, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); Eina_Accessor *_evas_box_accessor_new(const Eo *obj, Evas_Object_Box_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_box_accessor_new, Eina_Accessor *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_box_accessor_new, Eina_Accessor *, NULL); Evas_Object_Box_Option *_evas_box_internal_append(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_append, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_append, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); Eina_Bool _evas_box_option_property_vset(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Option *opt, int property, va_list *args); -EOAPI EFL_FUNC_BODYV(evas_obj_box_option_property_vset, Eina_Bool, 0, EFL_FUNC_CALL(opt, property, args), Evas_Object_Box_Option *opt, int property, va_list *args); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_option_property_vset, Eina_Bool, 0, EFL_FUNC_CALL(opt, property, args), Evas_Object_Box_Option *opt, int property, va_list *args); Efl_Canvas_Object *_evas_box_internal_remove_at(Eo *obj, Evas_Object_Box_Data *pd, unsigned int pos); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_remove_at, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(pos), unsigned int pos); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_remove_at, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(pos), unsigned int pos); Eina_Bool _evas_box_remove_at(Eo *obj, Evas_Object_Box_Data *pd, unsigned int pos); -EOAPI EFL_FUNC_BODYV(evas_obj_box_remove_at, Eina_Bool, 0, EFL_FUNC_CALL(pos), unsigned int pos); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_remove_at, Eina_Bool, 0, EFL_FUNC_CALL(pos), unsigned int pos); Eina_Bool _evas_box_option_property_vget(const Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Option *opt, int property, va_list *args); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_vget, Eina_Bool, 0, EFL_FUNC_CALL(opt, property, args), Evas_Object_Box_Option *opt, int property, va_list *args); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_vget, Eina_Bool, 0, EFL_FUNC_CALL(opt, property, args), Evas_Object_Box_Option *opt, int property, va_list *args); Evas_Object_Box_Option *_evas_box_internal_insert_at(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, unsigned int pos); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_insert_at, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, pos), Efl_Canvas_Object *child, unsigned int pos); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_insert_at, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, pos), Efl_Canvas_Object *child, unsigned int pos); Evas_Object_Box_Option *_evas_box_insert_before(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); -EOAPI EFL_FUNC_BODYV(evas_obj_box_insert_before, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_insert_before, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); const char *_evas_box_option_property_name_get(const Eo *obj, Evas_Object_Box_Data *pd, int property); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_name_get, const char *, NULL, EFL_FUNC_CALL(property), int property); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_box_option_property_name_get, const char *, NULL, EFL_FUNC_CALL(property), int property); Evas_Object_Box_Option *_evas_box_internal_insert_before(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_insert_before, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_insert_before, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); void _evas_box_layout_homogeneous_horizontal(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); Evas_Object_Box_Option *_evas_box_internal_option_new(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_option_new, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_option_new, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); void _evas_box_layout_homogeneous_max_size_vertical(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_max_size_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_max_size_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); Evas_Object_Box_Option *_evas_box_internal_insert_after(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_insert_after, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_insert_after, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, reference), Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); Evas_Object_Box_Option *_evas_box_insert_at(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child, unsigned int pos); -EOAPI EFL_FUNC_BODYV(evas_obj_box_insert_at, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, pos), Efl_Canvas_Object *child, unsigned int pos); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_insert_at, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child, pos), Efl_Canvas_Object *child, unsigned int pos); Evas_Object_Box_Option *_evas_box_internal_prepend(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_internal_prepend, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_internal_prepend, Evas_Object_Box_Option *, NULL, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); Eina_Bool _evas_box_remove(Eo *obj, Evas_Object_Box_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_box_remove, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_box_remove, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); void _evas_box_layout_stack(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_stack, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_stack, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); void _evas_box_layout_homogeneous_vertical(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_homogeneous_vertical, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); void _evas_box_layout_flow_horizontal(Eo *obj, Evas_Object_Box_Data *pd, Evas_Object_Box_Data *priv, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_box_layout_flow_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_box_layout_flow_horizontal, EFL_FUNC_CALL(priv, data), Evas_Object_Box_Data *priv, void *data); int _evas_box_count(Eo *obj, Evas_Object_Box_Data *pd); -EOAPI EFL_FUNC_BODY(evas_obj_box_count, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_obj_box_count, int, 0); Efl_Object *_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *pd); diff --git a/src/lib/evas/canvas/evas_box_eo.h b/src/lib/evas/canvas/evas_box_eo.h index e78f97a5e4..d9134cf5c5 100644 --- a/src/lib/evas/canvas/evas_box_eo.h +++ b/src/lib/evas/canvas/evas_box_eo.h @@ -19,7 +19,7 @@ typedef Eo Evas_Box; */ #define EVAS_BOX_CLASS evas_box_class_get() -EWAPI const Efl_Class *evas_box_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_box_class_get(void) EINA_CONST; /** * @brief Set the alignment of the whole bounding box of contents, for a given @@ -41,7 +41,7 @@ EWAPI const Efl_Class *evas_box_class_get(void) EINA_CONST; * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_align_set(Eo *obj, double horizontal, double vertical); +EVAS_API EVAS_API_WEAK void evas_obj_box_align_set(Eo *obj, double horizontal, double vertical); /** * @brief Get the alignment of the whole bounding box of contents, for a given @@ -55,7 +55,7 @@ EOAPI void evas_obj_box_align_set(Eo *obj, double horizontal, double vertical); * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_align_get(const Eo *obj, double *horizontal, double *vertical); +EVAS_API EVAS_API_WEAK void evas_obj_box_align_get(const Eo *obj, double *horizontal, double *vertical); /** * @brief Set the (space) padding between cells set for a given box object. @@ -70,7 +70,7 @@ EOAPI void evas_obj_box_align_get(const Eo *obj, double *horizontal, double *ver * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_padding_set(Eo *obj, int horizontal, int vertical); +EVAS_API EVAS_API_WEAK void evas_obj_box_padding_set(Eo *obj, int horizontal, int vertical); /** * @brief Get the (space) padding between cells set for a given box object. @@ -83,7 +83,7 @@ EOAPI void evas_obj_box_padding_set(Eo *obj, int horizontal, int vertical); * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_padding_get(const Eo *obj, int *horizontal, int *vertical); +EVAS_API EVAS_API_WEAK void evas_obj_box_padding_get(const Eo *obj, int *horizontal, int *vertical); /** * @brief Set a new layouting function to a given box object @@ -110,7 +110,7 @@ EOAPI void evas_obj_box_padding_get(const Eo *obj, int *horizontal, int *vertica * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_set(Eo *obj, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_set(Eo *obj, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data) EINA_ARG_NONNULL(2); /** * @brief Layout function which sets the box o to a (basic) horizontal box @@ -161,7 +161,7 @@ EOAPI void evas_obj_box_layout_set(Eo *obj, Evas_Object_Box_Layout cb, const voi * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a (basic) vertical box @@ -176,7 +176,7 @@ EOAPI void evas_obj_box_layout_horizontal(Eo *obj, Evas_Object_Box_Data *priv, v * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a maximum size, homogeneous @@ -221,10 +221,10 @@ EOAPI void evas_obj_box_layout_vertical(Eo *obj, Evas_Object_Box_Data *priv, voi * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_homogeneous_max_size_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_homogeneous_max_size_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Child object to be removed @@ -233,7 +233,7 @@ EOAPI void evas_obj_box_layout_homogeneous_max_size_horizontal(Eo *obj, Evas_Obj * * @ingroup Evas_Box */ -EOAPI Efl_Canvas_Object *evas_obj_box_internal_remove(Eo *obj, Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_box_internal_remove(Eo *obj, Efl_Canvas_Object *child); /** * @brief Layout function which sets the box o to a flow vertical box. @@ -248,17 +248,17 @@ EOAPI Efl_Canvas_Object *evas_obj_box_internal_remove(Eo *obj, Efl_Canvas_Object * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_flow_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_flow_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] opt Box option to be freed * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_internal_option_free(Eo *obj, Evas_Object_Box_Option *opt); +EVAS_API EVAS_API_WEAK void evas_obj_box_internal_option_free(Eo *obj, Evas_Object_Box_Option *opt); /** * @brief Insert a new child object after another existing one, in a given box @@ -283,7 +283,7 @@ EOAPI void evas_obj_box_internal_option_free(Eo *obj, Evas_Object_Box_Option *op * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_insert_after(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_insert_after(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); /** * @brief Remove all child objects from a box object, unparenting them again. @@ -299,7 +299,7 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_insert_after(Eo *obj, Efl_Canvas_Obje * * @ingroup Evas_Box */ -EOAPI Eina_Bool evas_obj_box_remove_all(Eo *obj, Eina_Bool clear); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_box_remove_all(Eo *obj, Eina_Bool clear); /** * @brief Get an iterator to walk the list of children of a given box object. @@ -313,7 +313,7 @@ EOAPI Eina_Bool evas_obj_box_remove_all(Eo *obj, Eina_Bool clear); * * @ingroup Evas_Box */ -EOAPI Eina_Iterator *evas_obj_box_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Iterator *evas_obj_box_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Add a new box as a child of a given smart object. @@ -327,7 +327,7 @@ EOAPI Eina_Iterator *evas_obj_box_iterator_new(const Eo *obj) EINA_WARN_UNUSED_R * * @ingroup Evas_Box */ -EOAPI Efl_Canvas_Object *evas_obj_box_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_box_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Append a new child object to the given box object o. @@ -349,7 +349,7 @@ EOAPI Efl_Canvas_Object *evas_obj_box_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_append(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_append(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get the numerical identifier of the property of the child elements of @@ -369,7 +369,7 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_append(Eo *obj, Efl_Canvas_Object *ch * * @ingroup Evas_Box */ -EOAPI int evas_obj_box_option_property_id_get(const Eo *obj, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK int evas_obj_box_option_property_id_get(const Eo *obj, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2); /** * @brief Prepend a new child object to the given box object o. @@ -391,7 +391,7 @@ EOAPI int evas_obj_box_option_property_id_get(const Eo *obj, const char *name) E * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_prepend(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_prepend(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get an accessor (a structure providing random items access) to the @@ -406,10 +406,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_prepend(Eo *obj, Efl_Canvas_Object *c * * @ingroup Evas_Box */ -EOAPI Eina_Accessor *evas_obj_box_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Accessor *evas_obj_box_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Child object to be appended @@ -418,7 +418,7 @@ EOAPI Eina_Accessor *evas_obj_box_accessor_new(const Eo *obj) EINA_WARN_UNUSED_R * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_append(Eo *obj, Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_append(Eo *obj, Efl_Canvas_Object *child); /** * @brief Set a property value (by its given numerical identifier), on a given @@ -438,10 +438,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_append(Eo *obj, Efl_Canvas_O * * @ingroup Evas_Box */ -EOAPI Eina_Bool evas_obj_box_option_property_vset(Eo *obj, Evas_Object_Box_Option *opt, int property, va_list *args) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_box_option_property_vset(Eo *obj, Evas_Object_Box_Option *opt, int property, va_list *args) EINA_ARG_NONNULL(2); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] pos Position of object to be removed @@ -450,7 +450,7 @@ EOAPI Eina_Bool evas_obj_box_option_property_vset(Eo *obj, Evas_Object_Box_Optio * * @ingroup Evas_Box */ -EOAPI Efl_Canvas_Object *evas_obj_box_internal_remove_at(Eo *obj, unsigned int pos); +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_box_internal_remove_at(Eo *obj, unsigned int pos); /** * @brief Remove an object, bound to a given position in a box object, @@ -475,7 +475,7 @@ EOAPI Efl_Canvas_Object *evas_obj_box_internal_remove_at(Eo *obj, unsigned int p * * @ingroup Evas_Box */ -EOAPI Eina_Bool evas_obj_box_remove_at(Eo *obj, unsigned int pos); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_box_remove_at(Eo *obj, unsigned int pos); /** * @brief Get a property's value (by its given numerical identifier), on a @@ -496,10 +496,10 @@ EOAPI Eina_Bool evas_obj_box_remove_at(Eo *obj, unsigned int pos); * * @ingroup Evas_Box */ -EOAPI Eina_Bool evas_obj_box_option_property_vget(const Eo *obj, Evas_Object_Box_Option *opt, int property, va_list *args) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_box_option_property_vget(const Eo *obj, Evas_Object_Box_Option *opt, int property, va_list *args) EINA_ARG_NONNULL(2); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Child object to be inserted @@ -509,7 +509,7 @@ EOAPI Eina_Bool evas_obj_box_option_property_vget(const Eo *obj, Evas_Object_Box * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_at(Eo *obj, Efl_Canvas_Object *child, unsigned int pos); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_insert_at(Eo *obj, Efl_Canvas_Object *child, unsigned int pos); /** * @brief Insert a new child object before another existing one, in a given box @@ -534,7 +534,7 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_at(Eo *obj, Efl_Canva * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_insert_before(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_insert_before(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); /** * @brief Get the name of the property of the child elements of the box o which @@ -555,10 +555,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_insert_before(Eo *obj, Efl_Canvas_Obj * * @ingroup Evas_Box */ -EOAPI const char *evas_obj_box_option_property_name_get(const Eo *obj, int property) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK const char *evas_obj_box_option_property_name_get(const Eo *obj, int property) EINA_WARN_UNUSED_RESULT; /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Object to be inserted @@ -568,7 +568,7 @@ EOAPI const char *evas_obj_box_option_property_name_get(const Eo *obj, int prope * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_before(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_insert_before(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); /** * @brief Layout function which sets the box o to a homogeneous horizontal box @@ -605,10 +605,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_before(Eo *obj, Efl_C * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_homogeneous_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_homogeneous_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child New box object @@ -617,7 +617,7 @@ EOAPI void evas_obj_box_layout_homogeneous_horizontal(Eo *obj, Evas_Object_Box_D * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_option_new(Eo *obj, Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_option_new(Eo *obj, Efl_Canvas_Object *child); /** * @brief Layout function which sets the box o to a maximum size, homogeneous @@ -633,10 +633,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_option_new(Eo *obj, Efl_Canv * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_homogeneous_max_size_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_homogeneous_max_size_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Object to be inserted @@ -646,7 +646,7 @@ EOAPI void evas_obj_box_layout_homogeneous_max_size_vertical(Eo *obj, Evas_Objec * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_after(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_insert_after(Eo *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference); /** * @brief Insert a new child object at a given position, in a given box object @@ -673,10 +673,10 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_insert_after(Eo *obj, Efl_Ca * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_insert_at(Eo *obj, Efl_Canvas_Object *child, unsigned int pos) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_insert_at(Eo *obj, Efl_Canvas_Object *child, unsigned int pos) EINA_ARG_NONNULL(2); /** - * @brief No description supplied by the EAPI. + * @brief No description supplied by the EVAS_API. * * @param[in] obj The object. * @param[in] child Object to be prepended @@ -685,7 +685,7 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_insert_at(Eo *obj, Efl_Canvas_Object * * @ingroup Evas_Box */ -EOAPI Evas_Object_Box_Option *evas_obj_box_internal_prepend(Eo *obj, Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK Evas_Object_Box_Option *evas_obj_box_internal_prepend(Eo *obj, Efl_Canvas_Object *child); /** * @brief Remove a given object from a box object, unparenting it again. @@ -705,7 +705,7 @@ EOAPI Evas_Object_Box_Option *evas_obj_box_internal_prepend(Eo *obj, Efl_Canvas_ * * @ingroup Evas_Box */ -EOAPI Eina_Bool evas_obj_box_remove(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_box_remove(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Layout function which sets the box o to a stacking box @@ -731,7 +731,7 @@ EOAPI Eina_Bool evas_obj_box_remove(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_ * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_stack(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_stack(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a homogeneous vertical box. @@ -746,7 +746,7 @@ EOAPI void evas_obj_box_layout_stack(Eo *obj, Evas_Object_Box_Data *priv, void * * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_homogeneous_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_homogeneous_vertical(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a flow horizontal box. @@ -784,7 +784,7 @@ EOAPI void evas_obj_box_layout_homogeneous_vertical(Eo *obj, Evas_Object_Box_Dat * * @ingroup Evas_Box */ -EOAPI void evas_obj_box_layout_flow_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API EVAS_API_WEAK void evas_obj_box_layout_flow_horizontal(Eo *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Returns the number of items in the box. @@ -795,9 +795,9 @@ EOAPI void evas_obj_box_layout_flow_horizontal(Eo *obj, Evas_Object_Box_Data *pr * * @ingroup Evas_Box */ -EOAPI int evas_obj_box_count(Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_box_count(Eo *obj); -EWAPI extern const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_ADDED; +EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_ADDED; /** Called when a child object was added to the box * @return Evas_Object_Box_Option * @@ -806,7 +806,7 @@ EWAPI extern const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_ADDED; */ #define EVAS_BOX_EVENT_CHILD_ADDED (&(_EVAS_BOX_EVENT_CHILD_ADDED)) -EWAPI extern const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_REMOVED; +EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_BOX_EVENT_CHILD_REMOVED; /** Called when a child object was removed from the box * @return Efl_Canvas_Object * diff --git a/src/lib/evas/canvas/evas_box_eo.legacy.c b/src/lib/evas/canvas/evas_box_eo.legacy.c index c2ac6b840c..1eedf18f37 100644 --- a/src/lib/evas/canvas/evas_box_eo.legacy.c +++ b/src/lib/evas/canvas/evas_box_eo.legacy.c @@ -1,161 +1,161 @@ -EAPI void +EVAS_API void evas_object_box_align_set(Evas_Box *obj, double horizontal, double vertical) { evas_obj_box_align_set(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_box_align_get(const Evas_Box *obj, double *horizontal, double *vertical) { evas_obj_box_align_get(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_box_padding_set(Evas_Box *obj, int horizontal, int vertical) { evas_obj_box_padding_set(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_box_padding_get(const Evas_Box *obj, int *horizontal, int *vertical) { evas_obj_box_padding_get(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_box_layout_set(Evas_Box *obj, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data) { evas_obj_box_layout_set(obj, cb, data, free_data); } -EAPI void +EVAS_API void evas_object_box_layout_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_horizontal(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_vertical(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_homogeneous_max_size_horizontal(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_flow_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_flow_vertical(obj, priv, data); } -EAPI Evas_Object_Box_Option * +EVAS_API Evas_Object_Box_Option * evas_object_box_insert_after(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) { return evas_obj_box_insert_after(obj, child, reference); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_remove_all(Evas_Box *obj, Eina_Bool clear) { return evas_obj_box_remove_all(obj, clear); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_object_box_iterator_new(const Evas_Box *obj) { return evas_obj_box_iterator_new(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_box_add_to(Evas_Box *obj) { return evas_obj_box_add_to(obj); } -EAPI Evas_Object_Box_Option * +EVAS_API Evas_Object_Box_Option * evas_object_box_append(Evas_Box *obj, Efl_Canvas_Object *child) { return evas_obj_box_append(obj, child); } -EAPI int +EVAS_API int evas_object_box_option_property_id_get(const Evas_Box *obj, const char *name) { return evas_obj_box_option_property_id_get(obj, name); } -EAPI Evas_Object_Box_Option * +EVAS_API Evas_Object_Box_Option * evas_object_box_prepend(Evas_Box *obj, Efl_Canvas_Object *child) { return evas_obj_box_prepend(obj, child); } -EAPI Eina_Accessor * +EVAS_API Eina_Accessor * evas_object_box_accessor_new(const Evas_Box *obj) { return evas_obj_box_accessor_new(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_remove_at(Evas_Box *obj, unsigned int pos) { return evas_obj_box_remove_at(obj, pos); } -EAPI Evas_Object_Box_Option * +EVAS_API Evas_Object_Box_Option * evas_object_box_insert_before(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) { return evas_obj_box_insert_before(obj, child, reference); } -EAPI const char * +EVAS_API const char * evas_object_box_option_property_name_get(const Evas_Box *obj, int property) { return evas_obj_box_option_property_name_get(obj, property); } -EAPI void +EVAS_API void evas_object_box_layout_homogeneous_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_homogeneous_horizontal(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_homogeneous_max_size_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_homogeneous_max_size_vertical(obj, priv, data); } -EAPI Evas_Object_Box_Option * +EVAS_API Evas_Object_Box_Option * evas_object_box_insert_at(Evas_Box *obj, Efl_Canvas_Object *child, unsigned int pos) { return evas_obj_box_insert_at(obj, child, pos); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_remove(Evas_Box *obj, Efl_Canvas_Object *child) { return evas_obj_box_remove(obj, child); } -EAPI void +EVAS_API void evas_object_box_layout_stack(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_stack(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_homogeneous_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_homogeneous_vertical(obj, priv, data); } -EAPI void +EVAS_API void evas_object_box_layout_flow_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data) { evas_obj_box_layout_flow_horizontal(obj, priv, data); diff --git a/src/lib/evas/canvas/evas_box_eo.legacy.h b/src/lib/evas/canvas/evas_box_eo.legacy.h index ba67589525..71c0d8ff4e 100644 --- a/src/lib/evas/canvas/evas_box_eo.legacy.h +++ b/src/lib/evas/canvas/evas_box_eo.legacy.h @@ -34,7 +34,7 @@ typedef Eo Evas_Box; * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_align_set(Evas_Box *obj, double horizontal, double vertical); +EVAS_API void evas_object_box_align_set(Evas_Box *obj, double horizontal, double vertical); /** * @brief Get the alignment of the whole bounding box of contents, for a given @@ -48,7 +48,7 @@ EAPI void evas_object_box_align_set(Evas_Box *obj, double horizontal, double ver * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_align_get(const Evas_Box *obj, double *horizontal, double *vertical); +EVAS_API void evas_object_box_align_get(const Evas_Box *obj, double *horizontal, double *vertical); /** * @brief Set the (space) padding between cells set for a given box object. @@ -63,7 +63,7 @@ EAPI void evas_object_box_align_get(const Evas_Box *obj, double *horizontal, dou * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_padding_set(Evas_Box *obj, int horizontal, int vertical); +EVAS_API void evas_object_box_padding_set(Evas_Box *obj, int horizontal, int vertical); /** * @brief Get the (space) padding between cells set for a given box object. @@ -76,7 +76,7 @@ EAPI void evas_object_box_padding_set(Evas_Box *obj, int horizontal, int vertica * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_padding_get(const Evas_Box *obj, int *horizontal, int *vertical); +EVAS_API void evas_object_box_padding_get(const Evas_Box *obj, int *horizontal, int *vertical); /** * @brief Set a new layouting function to a given box object @@ -105,7 +105,7 @@ EAPI void evas_object_box_padding_get(const Evas_Box *obj, int *horizontal, int * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_set(Evas_Box *obj, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data) EINA_ARG_NONNULL(2); +EVAS_API void evas_object_box_layout_set(Evas_Box *obj, Evas_Object_Box_Layout cb, const void *data, Eina_Free_Cb free_data) EINA_ARG_NONNULL(2); /** * @brief Layout function which sets the box o to a (basic) horizontal box @@ -156,7 +156,7 @@ EAPI void evas_object_box_layout_set(Evas_Box *obj, Evas_Object_Box_Layout cb, c * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a (basic) vertical box @@ -171,7 +171,7 @@ EAPI void evas_object_box_layout_horizontal(Evas_Box *obj, Evas_Object_Box_Data * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a maximum size, homogeneous @@ -216,7 +216,7 @@ EAPI void evas_object_box_layout_vertical(Evas_Box *obj, Evas_Object_Box_Data *p * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** @@ -232,7 +232,7 @@ EAPI void evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Box *obj, * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_flow_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_flow_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** @@ -258,7 +258,7 @@ EAPI void evas_object_box_layout_flow_vertical(Evas_Box *obj, Evas_Object_Box_Da * * @ingroup Evas_Object_Box_Group */ -EAPI Evas_Object_Box_Option *evas_object_box_insert_after(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); +EVAS_API Evas_Object_Box_Option *evas_object_box_insert_after(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); /** * @brief Remove all child objects from a box object, unparenting them again. @@ -274,7 +274,7 @@ EAPI Evas_Object_Box_Option *evas_object_box_insert_after(Evas_Box *obj, Efl_Can * * @ingroup Evas_Object_Box_Group */ -EAPI Eina_Bool evas_object_box_remove_all(Evas_Box *obj, Eina_Bool clear); +EVAS_API Eina_Bool evas_object_box_remove_all(Evas_Box *obj, Eina_Bool clear); /** * @brief Get an iterator to walk the list of children of a given box object. @@ -288,7 +288,7 @@ EAPI Eina_Bool evas_object_box_remove_all(Evas_Box *obj, Eina_Bool clear); * * @ingroup Evas_Object_Box_Group */ -EAPI Eina_Iterator *evas_object_box_iterator_new(const Evas_Box *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Iterator *evas_object_box_iterator_new(const Evas_Box *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Add a new box as a child of a given smart object. @@ -302,7 +302,7 @@ EAPI Eina_Iterator *evas_object_box_iterator_new(const Evas_Box *obj) EINA_WARN_ * * @ingroup Evas_Object_Box_Group */ -EAPI Efl_Canvas_Object *evas_object_box_add_to(Evas_Box *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_box_add_to(Evas_Box *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Append a new child object to the given box object o. @@ -324,7 +324,7 @@ EAPI Efl_Canvas_Object *evas_object_box_add_to(Evas_Box *obj) EINA_WARN_UNUSED_R * * @ingroup Evas_Object_Box_Group */ -EAPI Evas_Object_Box_Option *evas_object_box_append(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API Evas_Object_Box_Option *evas_object_box_append(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get the numerical identifier of the property of the child elements of @@ -344,7 +344,7 @@ EAPI Evas_Object_Box_Option *evas_object_box_append(Evas_Box *obj, Efl_Canvas_Ob * * @ingroup Evas_Object_Box_Group */ -EAPI int evas_object_box_option_property_id_get(const Evas_Box *obj, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2); +EVAS_API int evas_object_box_option_property_id_get(const Evas_Box *obj, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2); /** * @brief Prepend a new child object to the given box object o. @@ -366,7 +366,7 @@ EAPI int evas_object_box_option_property_id_get(const Evas_Box *obj, const char * * @ingroup Evas_Object_Box_Group */ -EAPI Evas_Object_Box_Option *evas_object_box_prepend(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API Evas_Object_Box_Option *evas_object_box_prepend(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get an accessor (a structure providing random items access) to the @@ -381,7 +381,7 @@ EAPI Evas_Object_Box_Option *evas_object_box_prepend(Evas_Box *obj, Efl_Canvas_O * * @ingroup Evas_Object_Box_Group */ -EAPI Eina_Accessor *evas_object_box_accessor_new(const Evas_Box *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Accessor *evas_object_box_accessor_new(const Evas_Box *obj) EINA_WARN_UNUSED_RESULT; @@ -409,7 +409,7 @@ EAPI Eina_Accessor *evas_object_box_accessor_new(const Evas_Box *obj) EINA_WARN_ * * @ingroup Evas_Object_Box_Group */ -EAPI Eina_Bool evas_object_box_remove_at(Evas_Box *obj, unsigned int pos); +EVAS_API Eina_Bool evas_object_box_remove_at(Evas_Box *obj, unsigned int pos); @@ -436,7 +436,7 @@ EAPI Eina_Bool evas_object_box_remove_at(Evas_Box *obj, unsigned int pos); * * @ingroup Evas_Object_Box_Group */ -EAPI Evas_Object_Box_Option *evas_object_box_insert_before(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); +EVAS_API Evas_Object_Box_Option *evas_object_box_insert_before(Evas_Box *obj, Efl_Canvas_Object *child, const Efl_Canvas_Object *reference) EINA_ARG_NONNULL(2, 3); /** * @brief Get the name of the property of the child elements of the box o which @@ -457,7 +457,7 @@ EAPI Evas_Object_Box_Option *evas_object_box_insert_before(Evas_Box *obj, Efl_Ca * * @ingroup Evas_Object_Box_Group */ -EAPI const char *evas_object_box_option_property_name_get(const Evas_Box *obj, int property) EINA_WARN_UNUSED_RESULT; +EVAS_API const char *evas_object_box_option_property_name_get(const Evas_Box *obj, int property) EINA_WARN_UNUSED_RESULT; /** @@ -495,7 +495,7 @@ EAPI const char *evas_object_box_option_property_name_get(const Evas_Box *obj, i * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_homogeneous_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_homogeneous_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** @@ -512,7 +512,7 @@ EAPI void evas_object_box_layout_homogeneous_horizontal(Evas_Box *obj, Evas_Obje * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_homogeneous_max_size_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_homogeneous_max_size_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** @@ -540,7 +540,7 @@ EAPI void evas_object_box_layout_homogeneous_max_size_vertical(Evas_Box *obj, Ev * * @ingroup Evas_Object_Box_Group */ -EAPI Evas_Object_Box_Option *evas_object_box_insert_at(Evas_Box *obj, Efl_Canvas_Object *child, unsigned int pos) EINA_ARG_NONNULL(2); +EVAS_API Evas_Object_Box_Option *evas_object_box_insert_at(Evas_Box *obj, Efl_Canvas_Object *child, unsigned int pos) EINA_ARG_NONNULL(2); /** @@ -561,7 +561,7 @@ EAPI Evas_Object_Box_Option *evas_object_box_insert_at(Evas_Box *obj, Efl_Canvas * * @ingroup Evas_Object_Box_Group */ -EAPI Eina_Bool evas_object_box_remove(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API Eina_Bool evas_object_box_remove(Evas_Box *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Layout function which sets the box o to a stacking box @@ -587,7 +587,7 @@ EAPI Eina_Bool evas_object_box_remove(Evas_Box *obj, Efl_Canvas_Object *child) E * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_stack(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_stack(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a homogeneous vertical box. @@ -602,7 +602,7 @@ EAPI void evas_object_box_layout_stack(Evas_Box *obj, Evas_Object_Box_Data *priv * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_homogeneous_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_homogeneous_vertical(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); /** * @brief Layout function which sets the box o to a flow horizontal box. @@ -640,7 +640,7 @@ EAPI void evas_object_box_layout_homogeneous_vertical(Evas_Box *obj, Evas_Object * * @ingroup Evas_Object_Box_Group */ -EAPI void evas_object_box_layout_flow_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); +EVAS_API void evas_object_box_layout_flow_horizontal(Evas_Box *obj, Evas_Object_Box_Data *priv, void *data); #endif diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 784458fd8b..39bf42c6d5 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -474,14 +474,14 @@ nothing_here: _evas_unwalk(e); } -EAPI void +EVAS_API void evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) { evas_object_event_callback_priority_add(eo_obj, type, EVAS_CALLBACK_PRIORITY_DEFAULT, func, data); } -EAPI void +EVAS_API void evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) { Evas_Object_Protected_Data *obj; @@ -509,7 +509,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info)); } -EAPI void * +EVAS_API void * evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Object_Event_Cb func) { Evas_Object_Protected_Data *obj; @@ -539,7 +539,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva return NULL; } -EAPI void * +EVAS_API void * evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) { Evas_Object_Protected_Data *obj; @@ -569,7 +569,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type return NULL; } -EAPI void +EVAS_API void evas_event_callback_add(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) { evas_event_callback_priority_add(eo_e, type, EVAS_CALLBACK_PRIORITY_DEFAULT, @@ -594,7 +594,7 @@ _deferred_callbacks_process(Evas *eo_e, Evas_Public_Data *e) } } -EAPI void +EVAS_API void evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) { Evas_Public_Data *e; @@ -630,7 +630,7 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb } } -EAPI void * +EVAS_API void * evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) { Evas_Public_Data *e; @@ -674,7 +674,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func) return NULL; } -EAPI void * +EVAS_API void * evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) { Evas_Public_Data *e; @@ -718,7 +718,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb return NULL; } -EAPI void +EVAS_API void evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const void *data) { Evas_Public_Data *e; @@ -747,7 +747,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const e->post_events = eina_list_prepend(e->post_events, pc); } -EAPI void +EVAS_API void evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func) { Evas_Public_Data *e; @@ -768,7 +768,7 @@ evas_post_event_callback_remove(Evas *eo_e, Evas_Object_Event_Post_Cb func) } } -EAPI void +EVAS_API void evas_post_event_callback_remove_full(Evas *eo_e, Evas_Object_Event_Post_Cb func, const void *data) { Evas_Public_Data *e; diff --git a/src/lib/evas/canvas/evas_canvas_eo.c b/src/lib/evas/canvas/evas_canvas_eo.c index 2f618ce37c..3b7357f54e 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.c +++ b/src/lib/evas/canvas/evas_canvas_eo.c @@ -17,7 +17,7 @@ __eolian_evas_canvas_image_cache_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_image_cache_set, EFL_FUNC_CALL(size), int size); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_image_cache_set, EFL_FUNC_CALL(size), int size); int _evas_canvas_image_cache_get(const Eo *obj, Evas_Public_Data *pd); @@ -29,15 +29,15 @@ __eolian_evas_canvas_image_cache_get_reflect(const Eo *obj) return eina_value_int_init(val); } -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_image_cache_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_image_cache_get, int, 0); void _evas_canvas_event_default_flags_set(Eo *obj, Evas_Public_Data *pd, Evas_Event_Flags flags); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_event_default_flags_set, EFL_FUNC_CALL(flags), Evas_Event_Flags flags); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_event_default_flags_set, EFL_FUNC_CALL(flags), Evas_Event_Flags flags); Evas_Event_Flags _evas_canvas_event_default_flags_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_event_default_flags_get, Evas_Event_Flags, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_event_default_flags_get, Evas_Event_Flags, 0); void _evas_canvas_font_cache_set(Eo *obj, Evas_Public_Data *pd, int size); @@ -57,7 +57,7 @@ __eolian_evas_canvas_font_cache_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_font_cache_set, EFL_FUNC_CALL(size), int size); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_font_cache_set, EFL_FUNC_CALL(size), int size); int _evas_canvas_font_cache_get(const Eo *obj, Evas_Public_Data *pd); @@ -69,251 +69,251 @@ __eolian_evas_canvas_font_cache_get_reflect(const Eo *obj) return eina_value_int_init(val); } -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_font_cache_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_font_cache_get, int, 0); void _evas_canvas_data_attach_set(Eo *obj, Evas_Public_Data *pd, void *data); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_data_attach_set, EFL_FUNC_CALL(data), void *data); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_data_attach_set, EFL_FUNC_CALL(data), void *data); void *_evas_canvas_data_attach_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_data_attach_get, void *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_data_attach_get, void *, NULL); Efl_Canvas_Object *_evas_canvas_focus_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_focus_get, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_focus_get, Efl_Canvas_Object *, NULL); Efl_Canvas_Object *_evas_canvas_seat_focus_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(seat), Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(seat), Evas_Device *seat); Efl_Canvas_Object *_evas_canvas_object_top_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_object_top_get, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_object_top_get, Efl_Canvas_Object *, NULL); void _evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); void _evas_canvas_pointer_canvas_xy_get(const Eo *obj, Evas_Public_Data *pd, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_get, EFL_FUNC_CALL(x, y), int *x, int *y); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_canvas_xy_get, EFL_FUNC_CALL(x, y), int *x, int *y); int _evas_canvas_event_down_count_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_event_down_count_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_event_down_count_get, int, 0); int _evas_canvas_smart_objects_calculate_count_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_smart_objects_calculate_count_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_smart_objects_calculate_count_get, int, 0); Eina_Bool _evas_canvas_focus_state_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_focus_state_get, Eina_Bool, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_focus_state_get, Eina_Bool, 0); Eina_Bool _evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_state_get, Eina_Bool, 0, EFL_FUNC_CALL(seat), Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_seat_focus_state_get, Eina_Bool, 0, EFL_FUNC_CALL(seat), Evas_Device *seat); Eina_Bool _evas_canvas_changed_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_changed_get, Eina_Bool, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_changed_get, Eina_Bool, 0); void _evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_by_device_get, EFL_FUNC_CALL(dev, x, y), Evas_Device *dev, int *x, int *y); void _evas_canvas_pointer_output_xy_get(const Eo *obj, Evas_Public_Data *pd, int *x, int *y); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_get, EFL_FUNC_CALL(x, y), int *x, int *y); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_canvas_pointer_output_xy_get, EFL_FUNC_CALL(x, y), int *x, int *y); Efl_Canvas_Object *_evas_canvas_object_bottom_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_object_bottom_get, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_object_bottom_get, Efl_Canvas_Object *, NULL); unsigned int _evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device *dev); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_pointer_button_down_mask_by_device_get, unsigned int, 0, EFL_FUNC_CALL(dev), Evas_Device *dev); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_pointer_button_down_mask_by_device_get, unsigned int, 0, EFL_FUNC_CALL(dev), Evas_Device *dev); unsigned int _evas_canvas_pointer_button_down_mask_get(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_pointer_button_down_mask_get, unsigned int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_pointer_button_down_mask_get, unsigned int, 0); Eina_List *_evas_canvas_tree_objects_at_xy_get(Eo *obj, Evas_Public_Data *pd, Efl_Canvas_Object *stop, int x, int y); -EOAPI EFL_FUNC_BODYV(evas_canvas_tree_objects_at_xy_get, Eina_List *, NULL, EFL_FUNC_CALL(stop, x, y), Efl_Canvas_Object *stop, int x, int y); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_canvas_tree_objects_at_xy_get, Eina_List *, NULL, EFL_FUNC_CALL(stop, x, y), Efl_Canvas_Object *stop, int x, int y); void _evas_canvas_key_lock_on(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_on, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_on, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_seat_key_lock_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); void _evas_canvas_seat_key_lock_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_lock_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); void _evas_canvas_key_modifier_add(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_add, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_add, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_key_modifier_off(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_off, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_off, EFL_FUNC_CALL(keyname), const char *keyname); Eina_Bool _evas_canvas_render_async(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY(evas_canvas_render_async, Eina_Bool, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_canvas_render_async, Eina_Bool, 0); void _evas_canvas_focus_out(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_focus_out); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_focus_out); void _evas_canvas_norender(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_norender); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_norender); void _evas_canvas_nochange_pop(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_nochange_pop); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_nochange_pop); void _evas_canvas_key_lock_off(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_off, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_off, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_nochange_push(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_nochange_push); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_nochange_push); void _evas_canvas_font_cache_flush(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_font_cache_flush); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_font_cache_flush); void _evas_canvas_key_modifier_on(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_on, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_on, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_seat_key_modifier_on(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_on, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); void _evas_canvas_seat_key_modifier_off(Eo *obj, Evas_Public_Data *pd, const char *keyname, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_key_modifier_off, EFL_FUNC_CALL(keyname, seat), const char *keyname, Evas_Device *seat); Eina_List *_evas_canvas_font_available_list(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_font_available_list, Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_font_available_list, Eina_List *, NULL); Efl_Canvas_Object *_evas_canvas_object_name_find(const Eo *obj, Evas_Public_Data *pd, const char *name); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_object_name_find, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(name), const char *name); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_object_name_find, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(name), const char *name); void _evas_canvas_font_path_append(Eo *obj, Evas_Public_Data *pd, const char *path); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_font_path_append, EFL_FUNC_CALL(path), const char *path); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_font_path_append, EFL_FUNC_CALL(path), const char *path); void _evas_canvas_font_path_clear(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_font_path_clear); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_font_path_clear); void _evas_canvas_touch_point_list_nth_xy_get(Eo *obj, Evas_Public_Data *pd, unsigned int n, double *x, double *y); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_touch_point_list_nth_xy_get, EFL_FUNC_CALL(n, x, y), unsigned int n, double *x, double *y); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_touch_point_list_nth_xy_get, EFL_FUNC_CALL(n, x, y), unsigned int n, double *x, double *y); void _evas_canvas_key_lock_del(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_del, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_del, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_damage_rectangle_add(Eo *obj, Evas_Public_Data *pd, int x, int y, int w, int h); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_damage_rectangle_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_damage_rectangle_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); void _evas_canvas_sync(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_sync); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_sync); const Eina_List *_evas_canvas_font_path_list(const Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_canvas_font_path_list, const Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_canvas_font_path_list, const Eina_List *, NULL); void _evas_canvas_image_cache_reload(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_image_cache_reload); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_image_cache_reload); int _evas_canvas_coord_world_x_to_screen(const Eo *obj, Evas_Public_Data *pd, int x); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_coord_world_x_to_screen, int, 0, EFL_FUNC_CALL(x), int x); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_coord_world_x_to_screen, int, 0, EFL_FUNC_CALL(x), int x); Eina_List *_evas_canvas_render_updates(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_FUNC_BODY(evas_canvas_render_updates, Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_canvas_render_updates, Eina_List *, NULL); void _evas_canvas_image_cache_flush(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_image_cache_flush); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_image_cache_flush); int _evas_canvas_coord_screen_y_to_world(const Eo *obj, Evas_Public_Data *pd, int y); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_coord_screen_y_to_world, int, 0, EFL_FUNC_CALL(y), int y); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_coord_screen_y_to_world, int, 0, EFL_FUNC_CALL(y), int y); void _evas_canvas_key_modifier_del(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_del, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_modifier_del, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_focus_in(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_focus_in); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_focus_in); void _evas_canvas_seat_focus_in(Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_in, EFL_FUNC_CALL(seat), Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_in, EFL_FUNC_CALL(seat), Evas_Device *seat); void _evas_canvas_seat_focus_out(Eo *obj, Evas_Public_Data *pd, Evas_Device *seat); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_out, EFL_FUNC_CALL(seat), Evas_Device *seat); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_seat_focus_out, EFL_FUNC_CALL(seat), Evas_Device *seat); void _evas_canvas_obscured_rectangle_add(Eo *obj, Evas_Public_Data *pd, int x, int y, int w, int h); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_obscured_rectangle_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_obscured_rectangle_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); void _evas_canvas_render_dump(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_render_dump); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_render_dump); void _evas_canvas_render(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_render); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_render); void _evas_canvas_font_path_prepend(Eo *obj, Evas_Public_Data *pd, const char *path); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_font_path_prepend, EFL_FUNC_CALL(path), const char *path); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_font_path_prepend, EFL_FUNC_CALL(path), const char *path); void _evas_canvas_obscured_clear(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_obscured_clear); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_obscured_clear); int _evas_canvas_coord_screen_x_to_world(const Eo *obj, Evas_Public_Data *pd, int x); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_coord_screen_x_to_world, int, 0, EFL_FUNC_CALL(x), int x); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_coord_screen_x_to_world, int, 0, EFL_FUNC_CALL(x), int x); void _evas_canvas_key_lock_add(Eo *obj, Evas_Public_Data *pd, const char *keyname); -EOAPI EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_add, EFL_FUNC_CALL(keyname), const char *keyname); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_canvas_key_lock_add, EFL_FUNC_CALL(keyname), const char *keyname); void _evas_canvas_render_idle_flush(Eo *obj, Evas_Public_Data *pd); -EOAPI EFL_VOID_FUNC_BODY(evas_canvas_render_idle_flush); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(evas_canvas_render_idle_flush); Evas_Device *_evas_canvas_default_device_get(const Eo *obj, Evas_Public_Data *pd, Evas_Device_Class type); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_default_device_get, Evas_Device *, NULL, EFL_FUNC_CALL(type), Evas_Device_Class type); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_default_device_get, Evas_Device *, NULL, EFL_FUNC_CALL(type), Evas_Device_Class type); int _evas_canvas_coord_world_y_to_screen(const Eo *obj, Evas_Public_Data *pd, int y); -EOAPI EFL_FUNC_BODYV_CONST(evas_canvas_coord_world_y_to_screen, int, 0, EFL_FUNC_CALL(y), int y); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_canvas_coord_world_y_to_screen, int, 0, EFL_FUNC_CALL(y), int y); Efl_Object *_evas_canvas_efl_object_constructor(Eo *obj, Evas_Public_Data *pd); diff --git a/src/lib/evas/canvas/evas_canvas_eo.h b/src/lib/evas/canvas/evas_canvas_eo.h index fc21b39075..241ad9ccff 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.h +++ b/src/lib/evas/canvas/evas_canvas_eo.h @@ -19,7 +19,7 @@ typedef Eo Evas_Canvas; */ #define EVAS_CANVAS_CLASS evas_canvas_class_get() -EWAPI const Efl_Class *evas_canvas_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_canvas_class_get(void) EINA_CONST; /** * @brief Set the image cache. @@ -31,7 +31,7 @@ EWAPI const Efl_Class *evas_canvas_class_get(void) EINA_CONST; * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_image_cache_set(Eo *obj, int size); +EVAS_API EVAS_API_WEAK void evas_canvas_image_cache_set(Eo *obj, int size); /** * @brief Get the image cache. @@ -44,7 +44,7 @@ EOAPI void evas_canvas_image_cache_set(Eo *obj, int size); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_image_cache_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_canvas_image_cache_get(const Eo *obj); /** * @brief Set the default set of flags an event begins with @@ -60,7 +60,7 @@ EOAPI int evas_canvas_image_cache_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_event_default_flags_set(Eo *obj, Evas_Event_Flags flags); +EVAS_API EVAS_API_WEAK void evas_canvas_event_default_flags_set(Eo *obj, Evas_Event_Flags flags); /** * @brief Get the default set of flags an event begins with @@ -75,7 +75,7 @@ EOAPI void evas_canvas_event_default_flags_set(Eo *obj, Evas_Event_Flags flags); * * @ingroup Evas_Canvas */ -EOAPI Evas_Event_Flags evas_canvas_event_default_flags_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Evas_Event_Flags evas_canvas_event_default_flags_get(const Eo *obj); /** * @brief Changes the size of font cache of the given evas. @@ -85,7 +85,7 @@ EOAPI Evas_Event_Flags evas_canvas_event_default_flags_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_font_cache_set(Eo *obj, int size); +EVAS_API EVAS_API_WEAK void evas_canvas_font_cache_set(Eo *obj, int size); /** * @brief Get the size of font cache of the given evas in bytes. @@ -96,7 +96,7 @@ EOAPI void evas_canvas_font_cache_set(Eo *obj, int size); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_font_cache_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_canvas_font_cache_get(const Eo *obj); /** * @brief Attaches a specific pointer to the evas for fetching later. @@ -106,7 +106,7 @@ EOAPI int evas_canvas_font_cache_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_data_attach_set(Eo *obj, void *data); +EVAS_API EVAS_API_WEAK void evas_canvas_data_attach_set(Eo *obj, void *data); /** * @brief Returns the pointer attached by @ref evas_canvas_data_attach_set. @@ -117,7 +117,7 @@ EOAPI void evas_canvas_data_attach_set(Eo *obj, void *data); * * @ingroup Evas_Canvas */ -EOAPI void *evas_canvas_data_attach_get(const Eo *obj); +EVAS_API EVAS_API_WEAK void *evas_canvas_data_attach_get(const Eo *obj); /** * @brief Retrieve the object focused by the default seat. @@ -143,7 +143,7 @@ EOAPI void *evas_canvas_data_attach_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_focus_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_canvas_focus_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Return the focused object by a given seat. @@ -159,7 +159,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_focus_get(const Eo *obj) EINA_WARN_UNUSED_R * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_seat_focus_get(const Eo *obj, Evas_Device *seat); +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_canvas_seat_focus_get(const Eo *obj, Evas_Device *seat); /** * @brief Get the highest (stacked) Evas object on the canvas @c e. @@ -179,7 +179,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_seat_focus_get(const Eo *obj, Evas_Device * * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_object_top_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_canvas_object_top_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief This function returns the current known default pointer coordinates. @@ -193,7 +193,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_object_top_get(const Eo *obj) EINA_WARN_UNU * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); +EVAS_API EVAS_API_WEAK void evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates @@ -209,7 +209,7 @@ EOAPI void evas_canvas_pointer_canvas_xy_by_device_get(const Eo *obj, Evas_Devic * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_canvas_xy_get(const Eo *obj, int *x, int *y); +EVAS_API EVAS_API_WEAK void evas_canvas_pointer_canvas_xy_get(const Eo *obj, int *x, int *y); /** * @brief Get the number of mouse or multi presses currently active. @@ -222,7 +222,7 @@ EOAPI void evas_canvas_pointer_canvas_xy_get(const Eo *obj, int *x, int *y); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_event_down_count_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_canvas_event_down_count_get(const Eo *obj); /** * @brief This gets the internal counter that counts the number of smart @@ -244,7 +244,7 @@ EOAPI int evas_canvas_event_down_count_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_smart_objects_calculate_count_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_canvas_smart_objects_calculate_count_get(const Eo *obj); /** * @brief Get the focus state for the default seat. @@ -255,7 +255,7 @@ EOAPI int evas_canvas_smart_objects_calculate_count_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Eina_Bool evas_canvas_focus_state_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Eina_Bool evas_canvas_focus_state_get(const Eo *obj); /** * @brief Get the focus state by a given seat. @@ -268,7 +268,7 @@ EOAPI Eina_Bool evas_canvas_focus_state_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Eina_Bool evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Device *seat); +EVAS_API EVAS_API_WEAK Eina_Bool evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Device *seat); /** * @brief Get the changed marker for the canvas. @@ -281,7 +281,7 @@ EOAPI Eina_Bool evas_canvas_seat_focus_state_get(const Eo *obj, Evas_Device *sea * * @ingroup Evas_Canvas */ -EOAPI Eina_Bool evas_canvas_changed_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Eina_Bool evas_canvas_changed_get(const Eo *obj); /** * @brief This function returns the current known pointer coordinates. @@ -295,7 +295,7 @@ EOAPI Eina_Bool evas_canvas_changed_get(const Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); +EVAS_API EVAS_API_WEAK void evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates. @@ -311,7 +311,7 @@ EOAPI void evas_canvas_pointer_output_xy_by_device_get(const Eo *obj, Evas_Devic * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_pointer_output_xy_get(const Eo *obj, int *x, int *y); +EVAS_API EVAS_API_WEAK void evas_canvas_pointer_output_xy_get(const Eo *obj, int *x, int *y); /** * @brief Get the lowest (stacked) Evas object on the canvas @c e. @@ -331,7 +331,7 @@ EOAPI void evas_canvas_pointer_output_xy_get(const Eo *obj, int *x, int *y); * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_object_bottom_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_canvas_object_bottom_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Returns a bitmask with the mouse buttons currently pressed, set to 1. @@ -343,7 +343,7 @@ EOAPI Efl_Canvas_Object *evas_canvas_object_bottom_get(const Eo *obj) EINA_WARN_ * * @ingroup Evas_Canvas */ -EOAPI unsigned int evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Device *dev); +EVAS_API EVAS_API_WEAK unsigned int evas_canvas_pointer_button_down_mask_by_device_get(const Eo *obj, Evas_Device *dev); /** * @brief Returns a bitmask with the default mouse buttons currently pressed, @@ -369,7 +369,7 @@ EOAPI unsigned int evas_canvas_pointer_button_down_mask_by_device_get(const Eo * * * @ingroup Evas_Canvas */ -EOAPI unsigned int evas_canvas_pointer_button_down_mask_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK unsigned int evas_canvas_pointer_button_down_mask_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Retrieve a list of Evas objects lying over a given position in a @@ -389,7 +389,7 @@ EOAPI unsigned int evas_canvas_pointer_button_down_mask_get(const Eo *obj) EINA_ * * @ingroup Evas_Canvas */ -EOAPI Eina_List *evas_canvas_tree_objects_at_xy_get(Eo *obj, Efl_Canvas_Object *stop, int x, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_List *evas_canvas_tree_objects_at_xy_get(Eo *obj, Efl_Canvas_Object *stop, int x, int y) EINA_WARN_UNUSED_RESULT; /** * @brief Enables or turns on programmatically the lock key with name @@ -407,7 +407,7 @@ EOAPI Eina_List *evas_canvas_tree_objects_at_xy_get(Eo *obj, Efl_Canvas_Object * * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_lock_on(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_lock_on(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Enables or turns on programmatically the lock key with name @@ -429,7 +429,7 @@ EOAPI void evas_canvas_key_lock_on(Eo *obj, const char *keyname) EINA_ARG_NONNUL * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the lock key with name @@ -450,7 +450,7 @@ EOAPI void evas_canvas_seat_key_lock_on(Eo *obj, const char *keyname, Evas_Devic * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_lock_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_key_lock_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Adds the @c keyname key to the current list of modifier keys. @@ -476,7 +476,7 @@ EOAPI void evas_canvas_seat_key_lock_off(Eo *obj, const char *keyname, Evas_Devi * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_modifier_add(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_modifier_add(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -492,7 +492,7 @@ EOAPI void evas_canvas_key_modifier_add(Eo *obj, const char *keyname) EINA_ARG_N * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_modifier_off(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_modifier_off(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Render the given Evas canvas asynchronously. @@ -517,13 +517,13 @@ EOAPI void evas_canvas_key_modifier_off(Eo *obj, const char *keyname) EINA_ARG_N * * @ingroup Evas_Canvas */ -EOAPI Eina_Bool evas_canvas_render_async(Eo *obj); +EVAS_API EVAS_API_WEAK Eina_Bool evas_canvas_render_async(Eo *obj); /** Inform the evas that it lost the focus from the default seat. * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_focus_out(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_focus_out(Eo *obj); /** * @brief Update the canvas internal objects but not triggering immediate @@ -536,7 +536,7 @@ EOAPI void evas_canvas_focus_out(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_norender(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_norender(Eo *obj); /** * @brief Pop the nochange flag down 1. @@ -550,7 +550,7 @@ EOAPI void evas_canvas_norender(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_nochange_pop(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_nochange_pop(Eo *obj); /** * @brief Disables or turns off programmatically the lock key with name @@ -567,7 +567,7 @@ EOAPI void evas_canvas_nochange_pop(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_lock_off(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_lock_off(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Push the nochange flag up 1 @@ -581,13 +581,13 @@ EOAPI void evas_canvas_key_lock_off(Eo *obj, const char *keyname) EINA_ARG_NONNU * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_nochange_push(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_nochange_push(Eo *obj); /** Force the given evas and associated engine to flush its font cache. * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_font_cache_flush(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_font_cache_flush(Eo *obj); /** * @brief Enables or turns on programmatically the modifier key with name @@ -605,7 +605,7 @@ EOAPI void evas_canvas_font_cache_flush(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_modifier_on(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_modifier_on(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Enables or turns on programmatically the modifier key with name @@ -627,7 +627,7 @@ EOAPI void evas_canvas_key_modifier_on(Eo *obj, const char *keyname) EINA_ARG_NO * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -647,7 +647,7 @@ EOAPI void evas_canvas_seat_key_modifier_on(Eo *obj, const char *keyname, Evas_D * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_key_modifier_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_key_modifier_off(Eo *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief List of available font descriptions known or found by this evas. @@ -663,7 +663,7 @@ EOAPI void evas_canvas_seat_key_modifier_off(Eo *obj, const char *keyname, Evas_ * * @ingroup Evas_Canvas */ -EOAPI Eina_List *evas_canvas_font_available_list(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_List *evas_canvas_font_available_list(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Retrieves the object on the given evas with the given name. @@ -681,7 +681,7 @@ EOAPI Eina_List *evas_canvas_font_available_list(const Eo *obj) EINA_WARN_UNUSED * * @ingroup Evas_Canvas */ -EOAPI Efl_Canvas_Object *evas_canvas_object_name_find(const Eo *obj, const char *name) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_canvas_object_name_find(const Eo *obj, const char *name) EINA_WARN_UNUSED_RESULT; /** * @brief Appends a font path to the list of font paths used by the given evas. @@ -691,13 +691,13 @@ EOAPI Efl_Canvas_Object *evas_canvas_object_name_find(const Eo *obj, const char * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_font_path_append(Eo *obj, const char *path) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_font_path_append(Eo *obj, const char *path) EINA_ARG_NONNULL(2); /** Removes all font paths loaded into memory for the given evas. * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_font_path_clear(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_font_path_clear(Eo *obj); /** * @brief This function returns the nth touch point's coordinates. @@ -712,7 +712,7 @@ EOAPI void evas_canvas_font_path_clear(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y); +EVAS_API EVAS_API_WEAK void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y); /** * @brief Removes the @c keyname key from the current list of lock keys on @@ -723,7 +723,7 @@ EOAPI void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, doub * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_lock_del(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_lock_del(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Add a damage rectangle. @@ -742,13 +742,13 @@ EOAPI void evas_canvas_key_lock_del(Eo *obj, const char *keyname) EINA_ARG_NONNU * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_damage_rectangle_add(Eo *obj, int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK void evas_canvas_damage_rectangle_add(Eo *obj, int x, int y, int w, int h); /** Sync evas canvas * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_sync(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_sync(Eo *obj); /** * @brief Retrieves the list of font paths used by the given evas. @@ -759,7 +759,7 @@ EOAPI void evas_canvas_sync(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI const Eina_List *evas_canvas_font_path_list(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK const Eina_List *evas_canvas_font_path_list(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Reload the image cache. @@ -769,7 +769,7 @@ EOAPI const Eina_List *evas_canvas_font_path_list(const Eo *obj) EINA_WARN_UNUSE * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_image_cache_reload(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_image_cache_reload(Eo *obj); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. @@ -786,7 +786,7 @@ EOAPI void evas_canvas_image_cache_reload(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_coord_world_x_to_screen(const Eo *obj, int x) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK int evas_canvas_coord_world_x_to_screen(const Eo *obj, int x) EINA_WARN_UNUSED_RESULT; /** * @brief Force immediate renderization of the given Evas canvas. @@ -810,7 +810,7 @@ EOAPI int evas_canvas_coord_world_x_to_screen(const Eo *obj, int x) EINA_WARN_UN * * @ingroup Evas_Canvas */ -EOAPI Eina_List *evas_canvas_render_updates(Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_List *evas_canvas_render_updates(Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Flush the image cache of the canvas. @@ -820,7 +820,7 @@ EOAPI Eina_List *evas_canvas_render_updates(Eo *obj) EINA_WARN_UNUSED_RESULT; * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_image_cache_flush(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_image_cache_flush(Eo *obj); /** * @brief Convert/scale an output screen coordinate into canvas coordinates. @@ -837,7 +837,7 @@ EOAPI void evas_canvas_image_cache_flush(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_coord_screen_y_to_world(const Eo *obj, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK int evas_canvas_coord_screen_y_to_world(const Eo *obj, int y) EINA_WARN_UNUSED_RESULT; /** * @brief Removes the @c keyname key from the current list of modifier keys on @@ -850,13 +850,13 @@ EOAPI int evas_canvas_coord_screen_y_to_world(const Eo *obj, int y) EINA_WARN_UN * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_modifier_del(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_modifier_del(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** Inform to the evas that it got the focus from the default seat. * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_focus_in(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_focus_in(Eo *obj); /** * @brief Inform to the evas that it got the focus from a given seat. @@ -868,7 +868,7 @@ EOAPI void evas_canvas_focus_in(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_focus_in(Eo *obj, Evas_Device *seat); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_focus_in(Eo *obj, Evas_Device *seat); /** * @brief Inform to the evas that it lost the focus from a given seat. @@ -880,7 +880,7 @@ EOAPI void evas_canvas_seat_focus_in(Eo *obj, Evas_Device *seat); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_seat_focus_out(Eo *obj, Evas_Device *seat); +EVAS_API EVAS_API_WEAK void evas_canvas_seat_focus_out(Eo *obj, Evas_Device *seat); /** * @brief Add an "obscured region" to an Evas canvas. @@ -921,7 +921,7 @@ EOAPI void evas_canvas_seat_focus_out(Eo *obj, Evas_Device *seat); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_obscured_rectangle_add(Eo *obj, int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK void evas_canvas_obscured_rectangle_add(Eo *obj, int x, int y, int w, int h); /** * @brief Make the canvas discard as much data as possible used by the engine @@ -936,13 +936,13 @@ EOAPI void evas_canvas_obscured_rectangle_add(Eo *obj, int x, int y, int w, int * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_render_dump(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_render_dump(Eo *obj); /** Force renderization of the given canvas. * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_render(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_render(Eo *obj); /** * @brief Prepends a font path to the list of font paths used by the given @@ -953,7 +953,7 @@ EOAPI void evas_canvas_render(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_font_path_prepend(Eo *obj, const char *path) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_font_path_prepend(Eo *obj, const char *path) EINA_ARG_NONNULL(2); /** * @brief Remove all "obscured regions" from an Evas canvas. @@ -973,7 +973,7 @@ EOAPI void evas_canvas_font_path_prepend(Eo *obj, const char *path) EINA_ARG_NON * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_obscured_clear(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_obscured_clear(Eo *obj); /** * @brief Convert/scale an output screen coordinate into canvas coordinates. @@ -990,7 +990,7 @@ EOAPI void evas_canvas_obscured_clear(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_coord_screen_x_to_world(const Eo *obj, int x) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK int evas_canvas_coord_screen_x_to_world(const Eo *obj, int x) EINA_WARN_UNUSED_RESULT; /** * @brief Adds the @c keyname key to the current list of lock keys. @@ -1016,7 +1016,7 @@ EOAPI int evas_canvas_coord_screen_x_to_world(const Eo *obj, int x) EINA_WARN_UN * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_key_lock_add(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK void evas_canvas_key_lock_add(Eo *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Make the canvas discard internally cached data used for rendering. @@ -1028,7 +1028,7 @@ EOAPI void evas_canvas_key_lock_add(Eo *obj, const char *keyname) EINA_ARG_NONNU * * @ingroup Evas_Canvas */ -EOAPI void evas_canvas_render_idle_flush(Eo *obj); +EVAS_API EVAS_API_WEAK void evas_canvas_render_idle_flush(Eo *obj); /** * @brief Return the default device of a given type. @@ -1044,7 +1044,7 @@ EOAPI void evas_canvas_render_idle_flush(Eo *obj); * * @ingroup Evas_Canvas */ -EOAPI Evas_Device *evas_canvas_default_device_get(const Eo *obj, Evas_Device_Class type); +EVAS_API EVAS_API_WEAK Evas_Device *evas_canvas_default_device_get(const Eo *obj, Evas_Device_Class type); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. @@ -1061,6 +1061,6 @@ EOAPI Evas_Device *evas_canvas_default_device_get(const Eo *obj, Evas_Device_Cla * * @ingroup Evas_Canvas */ -EOAPI int evas_canvas_coord_world_y_to_screen(const Eo *obj, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK int evas_canvas_coord_world_y_to_screen(const Eo *obj, int y) EINA_WARN_UNUSED_RESULT; #endif diff --git a/src/lib/evas/canvas/evas_canvas_eo.legacy.c b/src/lib/evas/canvas/evas_canvas_eo.legacy.c index 93578fbba1..767d0e46f6 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.legacy.c +++ b/src/lib/evas/canvas/evas_canvas_eo.legacy.c @@ -1,383 +1,383 @@ -EAPI void +EVAS_API void evas_image_cache_set(Evas_Canvas *obj, int size) { evas_canvas_image_cache_set(obj, size); } -EAPI int +EVAS_API int evas_image_cache_get(const Evas_Canvas *obj) { return evas_canvas_image_cache_get(obj); } -EAPI void +EVAS_API void evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags) { evas_canvas_event_default_flags_set(obj, flags); } -EAPI Evas_Event_Flags +EVAS_API Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj) { return (Evas_Event_Flags)evas_canvas_event_default_flags_get(obj); } -EAPI void +EVAS_API void evas_font_cache_set(Evas_Canvas *obj, int size) { evas_canvas_font_cache_set(obj, size); } -EAPI int +EVAS_API int evas_font_cache_get(const Evas_Canvas *obj) { return evas_canvas_font_cache_get(obj); } -EAPI void +EVAS_API void evas_data_attach_set(Evas_Canvas *obj, void *data) { evas_canvas_data_attach_set(obj, data); } -EAPI void * +EVAS_API void * evas_data_attach_get(const Evas_Canvas *obj) { return evas_canvas_data_attach_get(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_focus_get(const Evas_Canvas *obj) { return evas_canvas_focus_get(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device *seat) { return evas_canvas_seat_focus_get(obj, seat); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_top_get(const Evas_Canvas *obj) { return evas_canvas_object_top_get(obj); } -EAPI void +EVAS_API void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y) { evas_canvas_pointer_canvas_xy_by_device_get(obj, dev, x, y); } -EAPI void +EVAS_API void evas_pointer_canvas_xy_get(const Evas_Canvas *obj, int *x, int *y) { evas_canvas_pointer_canvas_xy_get(obj, x, y); } -EAPI int +EVAS_API int evas_event_down_count_get(const Evas_Canvas *obj) { return evas_canvas_event_down_count_get(obj); } -EAPI int +EVAS_API int evas_smart_objects_calculate_count_get(const Evas_Canvas *obj) { return evas_canvas_smart_objects_calculate_count_get(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_focus_state_get(const Evas_Canvas *obj) { return evas_canvas_focus_state_get(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *seat) { return evas_canvas_seat_focus_state_get(obj, seat); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_changed_get(const Evas_Canvas *obj) { return evas_canvas_changed_get(obj); } -EAPI void +EVAS_API void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y) { evas_canvas_pointer_output_xy_by_device_get(obj, dev, x, y); } -EAPI void +EVAS_API void evas_pointer_output_xy_get(const Evas_Canvas *obj, int *x, int *y) { evas_canvas_pointer_output_xy_get(obj, x, y); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_bottom_get(const Evas_Canvas *obj) { return evas_canvas_object_bottom_get(obj); } -EAPI unsigned int +EVAS_API unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Evas_Device *dev) { return evas_canvas_pointer_button_down_mask_by_device_get(obj, dev); } -EAPI unsigned int +EVAS_API unsigned int evas_pointer_button_down_mask_get(const Evas_Canvas *obj) { return evas_canvas_pointer_button_down_mask_get(obj); } -EAPI Eina_List * +EVAS_API Eina_List * evas_tree_objects_at_xy_get(Evas_Canvas *obj, Efl_Canvas_Object *stop, int x, int y) { return evas_canvas_tree_objects_at_xy_get(obj, stop, x, y); } -EAPI void +EVAS_API void evas_key_lock_on(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_lock_on(obj, keyname); } -EAPI void +EVAS_API void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_lock_on(obj, keyname, seat); } -EAPI void +EVAS_API void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_lock_off(obj, keyname, seat); } -EAPI void +EVAS_API void evas_key_modifier_add(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_modifier_add(obj, keyname); } -EAPI void +EVAS_API void evas_key_modifier_off(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_modifier_off(obj, keyname); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_render_async(Evas_Canvas *obj) { return evas_canvas_render_async(obj); } -EAPI void +EVAS_API void evas_focus_out(Evas_Canvas *obj) { evas_canvas_focus_out(obj); } -EAPI void +EVAS_API void evas_norender(Evas_Canvas *obj) { evas_canvas_norender(obj); } -EAPI void +EVAS_API void evas_nochange_pop(Evas_Canvas *obj) { evas_canvas_nochange_pop(obj); } -EAPI void +EVAS_API void evas_key_lock_off(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_lock_off(obj, keyname); } -EAPI void +EVAS_API void evas_nochange_push(Evas_Canvas *obj) { evas_canvas_nochange_push(obj); } -EAPI void +EVAS_API void evas_font_cache_flush(Evas_Canvas *obj) { evas_canvas_font_cache_flush(obj); } -EAPI void +EVAS_API void evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_modifier_on(obj, keyname); } -EAPI void +EVAS_API void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_modifier_on(obj, keyname, seat); } -EAPI void +EVAS_API void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) { evas_canvas_seat_key_modifier_off(obj, keyname, seat); } -EAPI Eina_List * +EVAS_API Eina_List * evas_font_available_list(const Evas_Canvas *obj) { return evas_canvas_font_available_list(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_name_find(const Evas_Canvas *obj, const char *name) { return evas_canvas_object_name_find(obj, name); } -EAPI void +EVAS_API void evas_font_path_append(Evas_Canvas *obj, const char *path) { evas_canvas_font_path_append(obj, path); } -EAPI void +EVAS_API void evas_font_path_clear(Evas_Canvas *obj) { evas_canvas_font_path_clear(obj); } -EAPI void +EVAS_API void evas_key_lock_del(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_lock_del(obj, keyname); } -EAPI void +EVAS_API void evas_damage_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h) { evas_canvas_damage_rectangle_add(obj, x, y, w, h); } -EAPI void +EVAS_API void evas_sync(Evas_Canvas *obj) { evas_canvas_sync(obj); } -EAPI const Eina_List * +EVAS_API const Eina_List * evas_font_path_list(const Evas_Canvas *obj) { return evas_canvas_font_path_list(obj); } -EAPI void +EVAS_API void evas_image_cache_reload(Evas_Canvas *obj) { evas_canvas_image_cache_reload(obj); } -EAPI int +EVAS_API int evas_coord_world_x_to_screen(const Evas_Canvas *obj, int x) { return evas_canvas_coord_world_x_to_screen(obj, x); } -EAPI Eina_List * +EVAS_API Eina_List * evas_render_updates(Evas_Canvas *obj) { return evas_canvas_render_updates(obj); } -EAPI void +EVAS_API void evas_image_cache_flush(Evas_Canvas *obj) { evas_canvas_image_cache_flush(obj); } -EAPI int +EVAS_API int evas_coord_screen_y_to_world(const Evas_Canvas *obj, int y) { return evas_canvas_coord_screen_y_to_world(obj, y); } -EAPI void +EVAS_API void evas_key_modifier_del(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_modifier_del(obj, keyname); } -EAPI void +EVAS_API void evas_focus_in(Evas_Canvas *obj) { evas_canvas_focus_in(obj); } -EAPI void +EVAS_API void evas_obscured_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h) { evas_canvas_obscured_rectangle_add(obj, x, y, w, h); } -EAPI void +EVAS_API void evas_render_dump(Evas_Canvas *obj) { evas_canvas_render_dump(obj); } -EAPI void +EVAS_API void evas_render(Evas_Canvas *obj) { evas_canvas_render(obj); } -EAPI void +EVAS_API void evas_font_path_prepend(Evas_Canvas *obj, const char *path) { evas_canvas_font_path_prepend(obj, path); } -EAPI void +EVAS_API void evas_obscured_clear(Evas_Canvas *obj) { evas_canvas_obscured_clear(obj); } -EAPI int +EVAS_API int evas_coord_screen_x_to_world(const Evas_Canvas *obj, int x) { return evas_canvas_coord_screen_x_to_world(obj, x); } -EAPI void +EVAS_API void evas_key_lock_add(Evas_Canvas *obj, const char *keyname) { evas_canvas_key_lock_add(obj, keyname); } -EAPI void +EVAS_API void evas_render_idle_flush(Evas_Canvas *obj) { evas_canvas_render_idle_flush(obj); } -EAPI Evas_Device * +EVAS_API Evas_Device * evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Class type) { return evas_canvas_default_device_get(obj, type); } -EAPI int +EVAS_API int evas_coord_world_y_to_screen(const Evas_Canvas *obj, int y) { return evas_canvas_coord_world_y_to_screen(obj, y); diff --git a/src/lib/evas/canvas/evas_canvas_eo.legacy.h b/src/lib/evas/canvas/evas_canvas_eo.legacy.h index af009aa6a6..caf497e6bf 100644 --- a/src/lib/evas/canvas/evas_canvas_eo.legacy.h +++ b/src/lib/evas/canvas/evas_canvas_eo.legacy.h @@ -24,7 +24,7 @@ typedef Eo Evas_Canvas; * * @ingroup Evas_Canvas */ -EAPI void evas_image_cache_set(Evas_Canvas *obj, int size); +EVAS_API void evas_image_cache_set(Evas_Canvas *obj, int size); /** * @brief Get the image cache. @@ -37,7 +37,7 @@ EAPI void evas_image_cache_set(Evas_Canvas *obj, int size); * * @ingroup Evas_Canvas */ -EAPI int evas_image_cache_get(const Evas_Canvas *obj); +EVAS_API int evas_image_cache_get(const Evas_Canvas *obj); /** * @brief Set the default set of flags an event begins with @@ -53,7 +53,7 @@ EAPI int evas_image_cache_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags); +EVAS_API void evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags); /** * @brief Get the default set of flags an event begins with @@ -68,7 +68,7 @@ EAPI void evas_event_default_flags_set(Evas_Canvas *obj, Evas_Event_Flags flags) * * @ingroup Evas_Canvas */ -EAPI Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj); +EVAS_API Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj); /** * @brief Changes the size of font cache of the given evas. @@ -78,7 +78,7 @@ EAPI Evas_Event_Flags evas_event_default_flags_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_font_cache_set(Evas_Canvas *obj, int size); +EVAS_API void evas_font_cache_set(Evas_Canvas *obj, int size); /** * @brief Get the size of font cache of the given evas in bytes. @@ -89,7 +89,7 @@ EAPI void evas_font_cache_set(Evas_Canvas *obj, int size); * * @ingroup Evas_Canvas */ -EAPI int evas_font_cache_get(const Evas_Canvas *obj); +EVAS_API int evas_font_cache_get(const Evas_Canvas *obj); /** * @brief Attaches a specific pointer to the evas for fetching later. @@ -99,7 +99,7 @@ EAPI int evas_font_cache_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_data_attach_set(Evas_Canvas *obj, void *data); +EVAS_API void evas_data_attach_set(Evas_Canvas *obj, void *data); /** * @brief Returns the pointer attached by @ref evas_data_attach_set. @@ -110,7 +110,7 @@ EAPI void evas_data_attach_set(Evas_Canvas *obj, void *data); * * @ingroup Evas_Canvas */ -EAPI void *evas_data_attach_get(const Evas_Canvas *obj); +EVAS_API void *evas_data_attach_get(const Evas_Canvas *obj); /** * @brief Retrieve the object focused by the default seat. @@ -135,7 +135,7 @@ EAPI void *evas_data_attach_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI Efl_Canvas_Object *evas_focus_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_focus_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Return the focused object by a given seat. @@ -151,7 +151,7 @@ EAPI Efl_Canvas_Object *evas_focus_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_ * * @ingroup Evas_Canvas */ -EAPI Efl_Canvas_Object *evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device *seat); +EVAS_API Efl_Canvas_Object *evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device *seat); /** * @brief Get the highest (stacked) Evas object on the canvas @c e. @@ -171,7 +171,7 @@ EAPI Efl_Canvas_Object *evas_seat_focus_get(const Evas_Canvas *obj, Evas_Device * * @ingroup Evas_Canvas */ -EAPI Efl_Canvas_Object *evas_object_top_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_top_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief This function returns the current known default pointer coordinates. @@ -185,7 +185,7 @@ EAPI Efl_Canvas_Object *evas_object_top_get(const Evas_Canvas *obj) EINA_WARN_UN * * @ingroup Evas_Canvas */ -EAPI void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); +EVAS_API void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates @@ -201,7 +201,7 @@ EAPI void evas_pointer_canvas_xy_by_device_get(const Evas_Canvas *obj, Evas_Devi * * @ingroup Evas_Canvas */ -EAPI void evas_pointer_canvas_xy_get(const Evas_Canvas *obj, int *x, int *y); +EVAS_API void evas_pointer_canvas_xy_get(const Evas_Canvas *obj, int *x, int *y); /** * @brief Get the number of mouse or multi presses currently active. @@ -214,7 +214,7 @@ EAPI void evas_pointer_canvas_xy_get(const Evas_Canvas *obj, int *x, int *y); * * @ingroup Evas_Canvas */ -EAPI int evas_event_down_count_get(const Evas_Canvas *obj); +EVAS_API int evas_event_down_count_get(const Evas_Canvas *obj); /** * @brief This gets the internal counter that counts the number of smart @@ -236,7 +236,7 @@ EAPI int evas_event_down_count_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI int evas_smart_objects_calculate_count_get(const Evas_Canvas *obj); +EVAS_API int evas_smart_objects_calculate_count_get(const Evas_Canvas *obj); /** * @brief Get the focus state for the default seat. @@ -247,7 +247,7 @@ EAPI int evas_smart_objects_calculate_count_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI Eina_Bool evas_focus_state_get(const Evas_Canvas *obj); +EVAS_API Eina_Bool evas_focus_state_get(const Evas_Canvas *obj); /** * @brief Get the focus state by a given seat. @@ -260,7 +260,7 @@ EAPI Eina_Bool evas_focus_state_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *seat); +EVAS_API Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *seat); /** * @brief Get the changed marker for the canvas. @@ -273,7 +273,7 @@ EAPI Eina_Bool evas_seat_focus_state_get(const Evas_Canvas *obj, Evas_Device *se * * @ingroup Evas_Canvas */ -EAPI Eina_Bool evas_changed_get(const Evas_Canvas *obj); +EVAS_API Eina_Bool evas_changed_get(const Evas_Canvas *obj); /** * @brief This function returns the current known pointer coordinates. @@ -287,7 +287,7 @@ EAPI Eina_Bool evas_changed_get(const Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); +EVAS_API void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Device *dev, int *x, int *y); /** * @brief This function returns the current known default pointer coordinates. @@ -303,7 +303,7 @@ EAPI void evas_pointer_output_xy_by_device_get(const Evas_Canvas *obj, Evas_Devi * * @ingroup Evas_Canvas */ -EAPI void evas_pointer_output_xy_get(const Evas_Canvas *obj, int *x, int *y); +EVAS_API void evas_pointer_output_xy_get(const Evas_Canvas *obj, int *x, int *y); /** * @brief Get the lowest (stacked) Evas object on the canvas @c e. @@ -323,7 +323,7 @@ EAPI void evas_pointer_output_xy_get(const Evas_Canvas *obj, int *x, int *y); * * @ingroup Evas_Canvas */ -EAPI Efl_Canvas_Object *evas_object_bottom_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_bottom_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Returns a bitmask with the mouse buttons currently pressed, set to 1. @@ -335,7 +335,7 @@ EAPI Efl_Canvas_Object *evas_object_bottom_get(const Evas_Canvas *obj) EINA_WARN * * @ingroup Evas_Canvas */ -EAPI unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Evas_Device *dev); +EVAS_API unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas *obj, Evas_Device *dev); /** * @brief Returns a bitmask with the default mouse buttons currently pressed, @@ -361,7 +361,7 @@ EAPI unsigned int evas_pointer_button_down_mask_by_device_get(const Evas_Canvas * * @ingroup Evas_Canvas */ -EAPI unsigned int evas_pointer_button_down_mask_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API unsigned int evas_pointer_button_down_mask_get(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Retrieve a list of Evas objects lying over a given position in a @@ -381,7 +381,7 @@ EAPI unsigned int evas_pointer_button_down_mask_get(const Evas_Canvas *obj) EINA * * @ingroup Evas_Canvas */ -EAPI Eina_List *evas_tree_objects_at_xy_get(Evas_Canvas *obj, Efl_Canvas_Object *stop, int x, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_List *evas_tree_objects_at_xy_get(Evas_Canvas *obj, Efl_Canvas_Object *stop, int x, int y) EINA_WARN_UNUSED_RESULT; /** * @brief Enables or turns on programmatically the lock key with name @@ -399,7 +399,7 @@ EAPI Eina_List *evas_tree_objects_at_xy_get(Evas_Canvas *obj, Efl_Canvas_Object * * @ingroup Evas_Canvas */ -EAPI void evas_key_lock_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_lock_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Enables or turns on programmatically the lock key with name @@ -421,7 +421,7 @@ EAPI void evas_key_lock_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNU * * @ingroup Evas_Canvas */ -EAPI void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the lock key with name @@ -442,7 +442,7 @@ EAPI void evas_seat_key_lock_on(Evas_Canvas *obj, const char *keyname, Evas_Devi * * @ingroup Evas_Canvas */ -EAPI void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Adds the @c keyname key to the current list of modifier keys. @@ -468,7 +468,7 @@ EAPI void evas_seat_key_lock_off(Evas_Canvas *obj, const char *keyname, Evas_Dev * * @ingroup Evas_Canvas */ -EAPI void evas_key_modifier_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_modifier_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -484,7 +484,7 @@ EAPI void evas_key_modifier_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_ * * @ingroup Evas_Canvas */ -EAPI void evas_key_modifier_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_modifier_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Render the given Evas canvas asynchronously. @@ -509,13 +509,13 @@ EAPI void evas_key_modifier_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_ * * @ingroup Evas_Canvas */ -EAPI Eina_Bool evas_render_async(Evas_Canvas *obj); +EVAS_API Eina_Bool evas_render_async(Evas_Canvas *obj); /** Inform the evas that it lost the focus from the default seat. * * @ingroup Evas_Canvas */ -EAPI void evas_focus_out(Evas_Canvas *obj); +EVAS_API void evas_focus_out(Evas_Canvas *obj); /** * @brief Update the canvas internal objects but not triggering immediate @@ -528,7 +528,7 @@ EAPI void evas_focus_out(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_norender(Evas_Canvas *obj); +EVAS_API void evas_norender(Evas_Canvas *obj); /** * @brief Update the canvas internal objects but not triggering immediate @@ -543,7 +543,7 @@ EAPI void evas_norender(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_norender_with_updates(Eo *eo_e); +EVAS_API void evas_norender_with_updates(Eo *eo_e); /** * @brief Pop the nochange flag down 1. @@ -557,7 +557,7 @@ EAPI void evas_norender_with_updates(Eo *eo_e); * * @ingroup Evas_Canvas */ -EAPI void evas_nochange_pop(Evas_Canvas *obj); +EVAS_API void evas_nochange_pop(Evas_Canvas *obj); /** * @brief Disables or turns off programmatically the lock key with name @@ -574,7 +574,7 @@ EAPI void evas_nochange_pop(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_key_lock_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_lock_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Push the nochange flag up 1 @@ -588,13 +588,13 @@ EAPI void evas_key_lock_off(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONN * * @ingroup Evas_Canvas */ -EAPI void evas_nochange_push(Evas_Canvas *obj); +EVAS_API void evas_nochange_push(Evas_Canvas *obj); /** Force the given evas and associated engine to flush its font cache. * * @ingroup Evas_Canvas */ -EAPI void evas_font_cache_flush(Evas_Canvas *obj); +EVAS_API void evas_font_cache_flush(Evas_Canvas *obj); /** * @brief Enables or turns on programmatically the modifier key with name @@ -611,7 +611,7 @@ EAPI void evas_font_cache_flush(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Enables or turns on programmatically the modifier key with name @@ -632,7 +632,7 @@ EAPI void evas_key_modifier_on(Evas_Canvas *obj, const char *keyname) EINA_ARG_N * * @ingroup Evas_Canvas */ -EAPI void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief Disables or turns off programmatically the modifier key with name @@ -652,7 +652,7 @@ EAPI void evas_seat_key_modifier_on(Evas_Canvas *obj, const char *keyname, Evas_ * * @ingroup Evas_Canvas */ -EAPI void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); +EVAS_API void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas_Device *seat) EINA_ARG_NONNULL(2); /** * @brief List of available font descriptions known or found by this evas. @@ -668,7 +668,7 @@ EAPI void evas_seat_key_modifier_off(Evas_Canvas *obj, const char *keyname, Evas * * @ingroup Evas_Canvas */ -EAPI Eina_List *evas_font_available_list(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_List *evas_font_available_list(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Retrieves the object on the given evas with the given name. @@ -686,7 +686,7 @@ EAPI Eina_List *evas_font_available_list(const Evas_Canvas *obj) EINA_WARN_UNUSE * * @ingroup Evas_Canvas */ -EAPI Efl_Canvas_Object *evas_object_name_find(const Evas_Canvas *obj, const char *name) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_name_find(const Evas_Canvas *obj, const char *name) EINA_WARN_UNUSED_RESULT; /** * @brief Appends a font path to the list of font paths used by the given evas. @@ -696,13 +696,13 @@ EAPI Efl_Canvas_Object *evas_object_name_find(const Evas_Canvas *obj, const char * * @ingroup Evas_Canvas */ -EAPI void evas_font_path_append(Evas_Canvas *obj, const char *path) EINA_ARG_NONNULL(2); +EVAS_API void evas_font_path_append(Evas_Canvas *obj, const char *path) EINA_ARG_NONNULL(2); /** Removes all font paths loaded into memory for the given evas. * * @ingroup Evas_Canvas */ -EAPI void evas_font_path_clear(Evas_Canvas *obj); +EVAS_API void evas_font_path_clear(Evas_Canvas *obj); /** @@ -714,7 +714,7 @@ EAPI void evas_font_path_clear(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_key_lock_del(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_lock_del(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Add a damage rectangle. @@ -733,13 +733,13 @@ EAPI void evas_key_lock_del(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONN * * @ingroup Evas_Canvas */ -EAPI void evas_damage_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h); +EVAS_API void evas_damage_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h); /** Sync evas canvas * * @ingroup Evas_Canvas */ -EAPI void evas_sync(Evas_Canvas *obj); +EVAS_API void evas_sync(Evas_Canvas *obj); /** * @brief Retrieves the list of font paths used by the given evas. @@ -750,7 +750,7 @@ EAPI void evas_sync(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI const Eina_List *evas_font_path_list(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API const Eina_List *evas_font_path_list(const Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Reload the image cache. @@ -760,7 +760,7 @@ EAPI const Eina_List *evas_font_path_list(const Evas_Canvas *obj) EINA_WARN_UNUS * * @ingroup Evas_Canvas */ -EAPI void evas_image_cache_reload(Evas_Canvas *obj); +EVAS_API void evas_image_cache_reload(Evas_Canvas *obj); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. @@ -777,7 +777,7 @@ EAPI void evas_image_cache_reload(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI int evas_coord_world_x_to_screen(const Evas_Canvas *obj, int x) EINA_WARN_UNUSED_RESULT; +EVAS_API int evas_coord_world_x_to_screen(const Evas_Canvas *obj, int x) EINA_WARN_UNUSED_RESULT; /** * @brief Force immediate renderization of the given Evas canvas. @@ -801,7 +801,7 @@ EAPI int evas_coord_world_x_to_screen(const Evas_Canvas *obj, int x) EINA_WARN_U * * @ingroup Evas_Canvas */ -EAPI Eina_List *evas_render_updates(Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_List *evas_render_updates(Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Flush the image cache of the canvas. @@ -811,7 +811,7 @@ EAPI Eina_List *evas_render_updates(Evas_Canvas *obj) EINA_WARN_UNUSED_RESULT; * * @ingroup Evas_Canvas */ -EAPI void evas_image_cache_flush(Evas_Canvas *obj); +EVAS_API void evas_image_cache_flush(Evas_Canvas *obj); /** * @brief Convert/scale an output screen coordinate into canvas coordinates. @@ -828,7 +828,7 @@ EAPI void evas_image_cache_flush(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI int evas_coord_screen_y_to_world(const Evas_Canvas *obj, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API int evas_coord_screen_y_to_world(const Evas_Canvas *obj, int y) EINA_WARN_UNUSED_RESULT; /** * @brief Removes the @c keyname key from the current list of modifier keys on @@ -841,13 +841,13 @@ EAPI int evas_coord_screen_y_to_world(const Evas_Canvas *obj, int y) EINA_WARN_U * * @ingroup Evas_Canvas */ -EAPI void evas_key_modifier_del(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_modifier_del(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** Inform to the evas that it got the focus from the default seat. * * @ingroup Evas_Canvas */ -EAPI void evas_focus_in(Evas_Canvas *obj); +EVAS_API void evas_focus_in(Evas_Canvas *obj); @@ -890,7 +890,7 @@ EAPI void evas_focus_in(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_obscured_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h); +EVAS_API void evas_obscured_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int h); /** * @brief Make the canvas discard as much data as possible used by the engine @@ -905,13 +905,13 @@ EAPI void evas_obscured_rectangle_add(Evas_Canvas *obj, int x, int y, int w, int * * @ingroup Evas_Canvas */ -EAPI void evas_render_dump(Evas_Canvas *obj); +EVAS_API void evas_render_dump(Evas_Canvas *obj); /** Force renderization of the given canvas. * * @ingroup Evas_Canvas */ -EAPI void evas_render(Evas_Canvas *obj); +EVAS_API void evas_render(Evas_Canvas *obj); /** * @brief Prepends a font path to the list of font paths used by the given @@ -922,7 +922,7 @@ EAPI void evas_render(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI void evas_font_path_prepend(Evas_Canvas *obj, const char *path) EINA_ARG_NONNULL(2); +EVAS_API void evas_font_path_prepend(Evas_Canvas *obj, const char *path) EINA_ARG_NONNULL(2); /** * @brief Remove all "obscured regions" from an Evas canvas. @@ -942,7 +942,7 @@ EAPI void evas_font_path_prepend(Evas_Canvas *obj, const char *path) EINA_ARG_NO * * @ingroup Evas_Canvas */ -EAPI void evas_obscured_clear(Evas_Canvas *obj); +EVAS_API void evas_obscured_clear(Evas_Canvas *obj); /** * @brief Convert/scale an output screen coordinate into canvas coordinates. @@ -959,7 +959,7 @@ EAPI void evas_obscured_clear(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI int evas_coord_screen_x_to_world(const Evas_Canvas *obj, int x) EINA_WARN_UNUSED_RESULT; +EVAS_API int evas_coord_screen_x_to_world(const Evas_Canvas *obj, int x) EINA_WARN_UNUSED_RESULT; /** * @brief Adds the @c keyname key to the current list of lock keys. @@ -985,7 +985,7 @@ EAPI int evas_coord_screen_x_to_world(const Evas_Canvas *obj, int x) EINA_WARN_U * * @ingroup Evas_Canvas */ -EAPI void evas_key_lock_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); +EVAS_API void evas_key_lock_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONNULL(2); /** * @brief Make the canvas discard internally cached data used for rendering. @@ -997,7 +997,7 @@ EAPI void evas_key_lock_add(Evas_Canvas *obj, const char *keyname) EINA_ARG_NONN * * @ingroup Evas_Canvas */ -EAPI void evas_render_idle_flush(Evas_Canvas *obj); +EVAS_API void evas_render_idle_flush(Evas_Canvas *obj); /** * @brief Return the default device of a given type. @@ -1013,7 +1013,7 @@ EAPI void evas_render_idle_flush(Evas_Canvas *obj); * * @ingroup Evas_Canvas */ -EAPI Evas_Device *evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Class type); +EVAS_API Evas_Device *evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Class type); /** * @brief Convert/scale a canvas coordinate into output screen coordinates. @@ -1030,6 +1030,6 @@ EAPI Evas_Device *evas_default_device_get(const Evas_Canvas *obj, Evas_Device_Cl * * @ingroup Evas_Canvas */ -EAPI int evas_coord_world_y_to_screen(const Evas_Canvas *obj, int y) EINA_WARN_UNUSED_RESULT; +EVAS_API int evas_coord_world_y_to_screen(const Evas_Canvas *obj, int y) EINA_WARN_UNUSED_RESULT; #endif diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index af8d4d2431..1c3206e8a0 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -459,7 +459,7 @@ _clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) evas_object_clip_across_check(eo_obj, obj); } -EAPI void +EVAS_API void evas_object_clip_unset(Evas_Object *eo_obj) { efl_canvas_object_clipper_set(eo_obj, NULL); @@ -502,7 +502,7 @@ _efl_canvas_object_clipper_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool } } -EAPI const Eina_List * +EVAS_API const Eina_List * evas_object_clipees_get(const Evas_Object *eo_obj) { const Evas_Object_Protected_Data *tmp; @@ -519,7 +519,7 @@ evas_object_clipees_get(const Evas_Object *eo_obj) return answer; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_clipees_has(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c index f6b83e7215..a2282b20ea 100644 --- a/src/lib/evas/canvas/evas_data.c +++ b/src/lib/evas/canvas/evas_data.c @@ -1,21 +1,21 @@ #include "evas_common_private.h" #include "evas_private.h" -EAPI void +EVAS_API void evas_object_data_set(Evas_Object *eo_obj, const char *key, const void *data) { if (!efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) return; efl_key_data_set(eo_obj, key, data); } -EAPI void * +EVAS_API void * evas_object_data_get(const Evas_Object *eo_obj, const char *key) { if (!efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) return NULL; return efl_key_data_get(eo_obj, key); } -EAPI void * +EVAS_API void * evas_object_data_del(Evas_Object *eo_obj, const char *key) { void *data; diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c index 011be85db6..baad7522a2 100644 --- a/src/lib/evas/canvas/evas_device.c +++ b/src/lib/evas/canvas/evas_device.c @@ -137,7 +137,7 @@ _evas_canvas_efl_canvas_scene_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Dat return NULL; } -EAPI Evas_Device * +EVAS_API Evas_Device * evas_device_get(Evas *eo_e, const char *name) { return efl_canvas_scene_device_get(eo_e, name); @@ -167,13 +167,13 @@ _evas_canvas_efl_canvas_scene_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data return NULL; } -EAPI Evas_Device * +EVAS_API Evas_Device * evas_device_get_by_seat_id(Evas *eo_e, unsigned int id) { return efl_canvas_scene_seat_get(eo_e, id); } -EAPI Evas_Device * +EVAS_API Evas_Device * evas_device_add(Evas *eo_e) { return evas_device_add_full(eo_e, NULL, NULL, NULL, NULL, @@ -181,7 +181,7 @@ evas_device_add(Evas *eo_e) EVAS_DEVICE_SUBCLASS_NONE); } -EAPI Evas_Device * +EVAS_API Evas_Device * evas_device_add_full(Evas *eo_e, const char *name, const char *desc, Evas_Device *parent_dev, Evas_Device *emulation_dev, Evas_Device_Class clas, Evas_Device_Subclass sub_clas) @@ -263,7 +263,7 @@ evas_device_add_full(Evas *eo_e, const char *name, const char *desc, return dev; } -EAPI void +EVAS_API void evas_device_del(Evas_Device *dev) { if (!efl_invalidated_get(dev)) @@ -271,7 +271,7 @@ evas_device_del(Evas_Device *dev) efl_unref(dev); } -EAPI void +EVAS_API void evas_device_push(Evas *eo_e, Evas_Device *dev) { Evas_Public_Data *e = efl_data_scope_safe_get(eo_e, EVAS_CANVAS_CLASS); @@ -285,7 +285,7 @@ evas_device_push(Evas *eo_e, Evas_Device *dev) eina_array_push(e->cur_device, dev); } -EAPI void +EVAS_API void evas_device_pop(Evas *eo_e) { Evas_Device *dev; @@ -296,7 +296,7 @@ evas_device_pop(Evas *eo_e) if (dev) efl_unref(dev); } -EAPI const Eina_List * +EVAS_API const Eina_List * evas_device_list(Evas *eo_e, const Evas_Device *dev) { if (dev) return efl_input_device_children_get(dev); @@ -305,33 +305,33 @@ evas_device_list(Evas *eo_e, const Evas_Device *dev) return e ? e->devices : NULL; } -EAPI void +EVAS_API void evas_device_name_set(Evas_Device *dev, const char *name) { efl_name_set(dev, name); evas_event_callback_call(efl_input_device_evas_get(dev), EVAS_CALLBACK_DEVICE_CHANGED, dev); } -EAPI const char * +EVAS_API const char * evas_device_name_get(const Evas_Device *dev) { return efl_name_get(dev); } -EAPI void +EVAS_API void evas_device_description_set(Evas_Device *dev, const char *desc) { efl_comment_set(dev, desc); evas_event_callback_call(efl_input_device_evas_get(dev), EVAS_CALLBACK_DEVICE_CHANGED, dev); } -EAPI const char * +EVAS_API const char * evas_device_description_get(const Evas_Device *dev) { return efl_comment_get(dev); } -EAPI void +EVAS_API void evas_device_parent_set(Evas_Device *dev EINA_UNUSED, Evas_Device *parent EINA_UNUSED) { // Note: This function should be deprecated. parent_set doesn't make sense @@ -340,7 +340,7 @@ evas_device_parent_set(Evas_Device *dev EINA_UNUSED, Evas_Device *parent EINA_UN ERR("It is not advised and possible anymore to changed the parent of an Evas_Device."); } -EAPI const Evas_Device * +EVAS_API const Evas_Device * evas_device_parent_get(const Evas_Device *dev) { Eo *parent = efl_parent_get(dev); @@ -351,7 +351,7 @@ evas_device_parent_get(const Evas_Device *dev) return parent; } -EAPI void +EVAS_API void evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas) { EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(dev)); @@ -375,45 +375,45 @@ evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas) evas_event_callback_call(efl_input_device_evas_get(dev), EVAS_CALLBACK_DEVICE_CHANGED, dev); } -EAPI Evas_Device_Class +EVAS_API Evas_Device_Class evas_device_class_get(const Evas_Device *dev) { return (Evas_Device_Class)efl_input_device_type_get(dev); } -EAPI void +EVAS_API void evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas) { efl_input_device_subclass_set(dev, clas); evas_event_callback_call(efl_input_device_evas_get(dev), EVAS_CALLBACK_DEVICE_CHANGED, dev); } -EAPI Evas_Device_Subclass +EVAS_API Evas_Device_Subclass evas_device_subclass_get(const Evas_Device *dev) { return efl_input_device_subclass_get(dev); } -EAPI void +EVAS_API void evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src) { efl_input_device_source_set(dev, src); evas_event_callback_call(efl_input_device_evas_get(dev), EVAS_CALLBACK_DEVICE_CHANGED, dev); } -EAPI const Evas_Device * +EVAS_API const Evas_Device * evas_device_emulation_source_get(const Evas_Device *dev) { return efl_input_device_source_get(dev); } -EAPI void +EVAS_API void evas_device_seat_id_set(Evas_Device *dev, unsigned int id) { efl_input_device_seat_id_set(dev, id); } -EAPI unsigned int +EVAS_API unsigned int evas_device_seat_id_get(const Evas_Device *dev) { return efl_input_device_seat_id_get(dev); diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 96ec12c025..c76fb52de1 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -1536,13 +1536,13 @@ _canvas_event_thaw_eval_internal(Eo *eo_e, Evas_Public_Data *e) e->last_timestamp, NULL); } -EAPI void +EVAS_API void evas_event_freeze(Evas *eo_e) { efl_event_freeze(eo_e); } -EAPI void +EVAS_API void evas_event_thaw(Evas *eo_e) { efl_event_thaw(eo_e); @@ -1581,13 +1581,13 @@ _evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e) } } -EAPI int +EVAS_API int evas_event_freeze_get(const Evas *eo_e) { return efl_event_freeze_count_get(eo_e); } -EAPI void +EVAS_API void evas_event_thaw_eval(Evas *eo_e) { if (!evas_event_freeze_get(eo_e)) @@ -2082,14 +2082,14 @@ _canvas_event_feed_mouse_updown_legacy(Eo *eo_e, int b, Evas_Button_Flags flags, _canvas_event_feed_mouse_updown(eo_e, b, flags, timestamp, data, down, NULL, EINA_FALSE); } -EAPI void +EVAS_API void evas_event_feed_mouse_down(Eo *eo_e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); _canvas_event_feed_mouse_updown_legacy(eo_e, b, flags, timestamp, data, 1); } -EAPI void +EVAS_API void evas_event_feed_mouse_up(Eo *eo_e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -2155,7 +2155,7 @@ _canvas_event_feed_mouse_cancel_internal(Evas_Public_Data *e, Efl_Input_Pointer_ *ev = save; } -EAPI void +EVAS_API void evas_event_feed_mouse_cancel(Eo *eo_e, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -2253,7 +2253,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Input_Pointer_Data *pe) _evas_unwalk(e); } -EAPI void +EVAS_API void evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -2731,7 +2731,7 @@ _canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int efl_unref(evt); } -EAPI void +EVAS_API void evas_event_input_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -2739,7 +2739,7 @@ evas_event_input_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, cons _canvas_event_feed_mouse_move_legacy(eo_e, e, x - e->framespace.x, y - e->framespace.y, timestamp, data); } -EAPI void +EVAS_API void evas_event_feed_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -2972,14 +2972,14 @@ _canvas_event_feed_mouse_inout_legacy(Eo *eo_e, unsigned int timestamp, efl_unref(evt); } -EAPI void +EVAS_API void evas_event_feed_mouse_in(Eo *eo_e, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); _canvas_event_feed_mouse_inout_legacy(eo_e, timestamp, data, EINA_TRUE); } -EAPI void +EVAS_API void evas_event_feed_mouse_out(Eo *eo_e, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3236,7 +3236,7 @@ _canvas_event_feed_multi_internal(Evas *eo_e, Evas_Public_Data *e, efl_unref(evt); } -EAPI void +EVAS_API void evas_event_input_multi_down(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3247,7 +3247,7 @@ evas_event_input_multi_down(Eo *eo_e, int d, int x, int y, double rad, double ra fx, fy, flags, timestamp, data, EFL_POINTER_ACTION_DOWN); } -EAPI void +EVAS_API void evas_event_feed_multi_down(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3256,7 +3256,7 @@ evas_event_feed_multi_down(Eo *eo_e, int d, int x, int y, double rad, double rad fx, fy, flags, timestamp, data, EFL_POINTER_ACTION_DOWN); } -EAPI void +EVAS_API void evas_event_input_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3267,7 +3267,7 @@ evas_event_input_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx fx, fy, flags, timestamp, data, EFL_POINTER_ACTION_UP); } -EAPI void +EVAS_API void evas_event_feed_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3415,7 +3415,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da if (ev->device) efl_unref(ev->device); } -EAPI void +EVAS_API void evas_event_input_multi_move(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3426,7 +3426,7 @@ evas_event_input_multi_move(Eo *eo_e, int d, int x, int y, double rad, double ra EFL_POINTER_ACTION_MOVE); } -EAPI void +EVAS_API void evas_event_feed_multi_move(Eo *eo_e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3702,7 +3702,7 @@ _canvas_event_feed_key_legacy(Eo *eo_e, Evas_Public_Data *e, efl_unref(evt); } -EAPI void +EVAS_API void evas_event_feed_key_down(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3711,7 +3711,7 @@ evas_event_feed_key_down(Eo *eo_e, const char *keyname, const char *key, const c compose, timestamp, data, 0, 1); } -EAPI void +EVAS_API void evas_event_feed_key_up(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3720,7 +3720,7 @@ evas_event_feed_key_up(Eo *eo_e, const char *keyname, const char *key, const cha compose, timestamp, data, 0, 0); } -EAPI void +EVAS_API void evas_event_feed_key_down_with_keycode(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3729,7 +3729,7 @@ evas_event_feed_key_down_with_keycode(Eo *eo_e, const char *keyname, const char compose, timestamp, data, keycode, 1); } -EAPI void +EVAS_API void evas_event_feed_key_up_with_keycode(Eo *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -3738,7 +3738,7 @@ evas_event_feed_key_up_with_keycode(Eo *eo_e, const char *keyname, const char *k compose, timestamp, data, keycode, 0); } -EAPI void +EVAS_API void evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *data) { Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); @@ -3840,7 +3840,7 @@ _canvas_event_feed_axis_update_internal(Evas_Public_Data *e, Efl_Input_Pointer_D if (ev->device) efl_unref(ev->device); } -EAPI void +EVAS_API void evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int toolid, int naxis, const Evas_Axis *axes, const void *data) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); @@ -4004,7 +4004,7 @@ _efl_canvas_object_efl_object_event_thaw(Eo *obj, Evas_Object_Protected_Data *pd efl_event_thaw(efl_super(obj, EFL_CANVAS_OBJECT_CLASS)); } -EAPI void +EVAS_API void evas_object_freeze_events_set(Eo *eo_obj, Eina_Bool freeze) { Evas_Object_Protected_Data *pd = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); @@ -4022,7 +4022,7 @@ evas_object_freeze_events_set(Eo *eo_obj, Eina_Bool freeze) efl_event_thaw(eo_obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_freeze_events_get(const Eo *eo_obj EINA_UNUSED) { return (efl_event_freeze_count_get(eo_obj) > 0); @@ -4235,7 +4235,7 @@ _efl_canvas_object_efl_canvas_pointer_pointer_inside_get(const Eo *eo_obj, return EINA_FALSE; } -EAPI void +EVAS_API void evas_event_refeed_event(Eo *eo_e, void *event_copy, Evas_Callback_Type event_type) { EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index 18367fbb0a..2d98916ee6 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -1425,7 +1425,7 @@ evas_object_text_font_string_parse(char *buffer, char dest[14][256]) return n; } -EAPI void +EVAS_API void evas_font_path_global_append(const char *path) { if (!path) return; @@ -1436,7 +1436,7 @@ evas_font_path_global_append(const char *path) #endif } -EAPI void +EVAS_API void evas_font_path_global_prepend(const char *path) { if (!path) return; @@ -1447,7 +1447,7 @@ evas_font_path_global_prepend(const char *path) #endif } -EAPI void +EVAS_API void evas_font_path_global_clear(void) { while (global_font_path) @@ -1461,13 +1461,13 @@ evas_font_path_global_clear(void) #endif } -EAPI const Eina_List * +EVAS_API const Eina_List * evas_font_path_global_list(void) { return global_font_path; } -EAPI void +EVAS_API void evas_font_reinit(void) { #ifdef HAVE_FONTCONFIG diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c index 62b7a3fa0f..db4066a0e6 100644 --- a/src/lib/evas/canvas/evas_gl.c +++ b/src/lib/evas/canvas/evas_gl.c @@ -121,7 +121,7 @@ _evas_gl_internal_error_get(Evas_GL *evas_gl) return tls_data->error_state; } -EAPI Evas_GL * +EVAS_API Evas_GL * evas_gl_new(Evas *e) { Evas_GL *evas_gl; @@ -171,7 +171,7 @@ evas_gl_new(Evas *e) return evas_gl; } -EAPI void +EVAS_API void evas_gl_free(Evas_GL *evas_gl) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -199,7 +199,7 @@ evas_gl_free(Evas_GL *evas_gl) free(evas_gl); } -EAPI Evas_GL_Config * +EVAS_API Evas_GL_Config * evas_gl_config_new(void) { Evas_GL_Config *cfg; @@ -211,13 +211,13 @@ evas_gl_config_new(void) return cfg; } -EAPI void +EVAS_API void evas_gl_config_free(Evas_GL_Config *cfg) { if (cfg) free(cfg); } -EAPI Evas_GL_Surface * +EVAS_API Evas_GL_Surface * evas_gl_surface_create(Evas_GL *evas_gl, Evas_GL_Config *config, int width, int height) { Evas_GL_Surface *surf; @@ -265,7 +265,7 @@ evas_gl_surface_create(Evas_GL *evas_gl, Evas_GL_Config *config, int width, int return surf; } -EAPI Evas_GL_Surface * +EVAS_API Evas_GL_Surface * evas_gl_pbuffer_surface_create(Evas_GL *evas_gl, Evas_GL_Config *cfg, int w, int h, const int *attrib_list) { @@ -321,7 +321,7 @@ evas_gl_pbuffer_surface_create(Evas_GL *evas_gl, Evas_GL_Config *cfg, return surf; } -EAPI void +EVAS_API void evas_gl_surface_destroy(Evas_GL *evas_gl, Evas_GL_Surface *surf) { // Magic @@ -369,7 +369,7 @@ evas_gl_engine_data_get(void *evgl) return _evas_engine_context(evasgl->evas); } -EAPI Evas_GL_Context * +EVAS_API Evas_GL_Context * evas_gl_context_version_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx, Evas_GL_Context_Version version) { @@ -419,13 +419,13 @@ evas_gl_context_version_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx, return ctx; } -EAPI Evas_GL_Context * +EVAS_API Evas_GL_Context * evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx) { return evas_gl_context_version_create(evas_gl, share_ctx, EVAS_GL_GLES_2_X); } -EAPI void +EVAS_API void evas_gl_context_destroy(Evas_GL *evas_gl, Evas_GL_Context *ctx) { @@ -453,7 +453,7 @@ evas_gl_context_destroy(Evas_GL *evas_gl, Evas_GL_Context *ctx) ctx = NULL; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_gl_make_current(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_GL_Context *ctx) { Eina_Bool ret; @@ -481,7 +481,7 @@ evas_gl_make_current(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_GL_Context *c return ret; } -EAPI Evas_GL_Context * +EVAS_API Evas_GL_Context * evas_gl_current_context_get(Evas_GL *evas_gl) { Evas_GL_Context *comp; @@ -519,7 +519,7 @@ evas_gl_current_context_get(Evas_GL *evas_gl) return NULL; } -EAPI Evas_GL_Surface * +EVAS_API Evas_GL_Surface * evas_gl_current_surface_get(Evas_GL *evas_gl) { Evas_GL_Surface *comp; @@ -557,7 +557,7 @@ evas_gl_current_surface_get(Evas_GL *evas_gl) return NULL; } -EAPI Evas_GL * +EVAS_API Evas_GL * evas_gl_current_evas_gl_get(Evas_GL_Context **context, Evas_GL_Surface **surface) { Evas_GL *evasgl = NULL; @@ -577,7 +577,7 @@ evas_gl_current_evas_gl_get(Evas_GL_Context **context, Evas_GL_Surface **surface return evasgl; } -EAPI const char * +EVAS_API const char * evas_gl_string_query(Evas_GL *evas_gl, int name) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -587,7 +587,7 @@ evas_gl_string_query(Evas_GL *evas_gl, int name) return evas_gl->evas->engine.func->gl_string_query(_evas_engine_context(evas_gl->evas), name); } -EAPI Evas_GL_Func +EVAS_API Evas_GL_Func evas_gl_proc_address_get(Evas_GL *evas_gl, const char *name) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -597,7 +597,7 @@ evas_gl_proc_address_get(Evas_GL *evas_gl, const char *name) return (Evas_GL_Func)evas_gl->evas->engine.func->gl_proc_address_get(_evas_engine_context(evas_gl->evas), name); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_gl_native_surface_get(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_Native_Surface *ns) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -622,7 +622,7 @@ evas_gl_native_surface_get(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_Native_ } -EAPI Evas_GL_API * +EVAS_API Evas_GL_API * evas_gl_api_get(Evas_GL *evas_gl) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -632,7 +632,7 @@ evas_gl_api_get(Evas_GL *evas_gl) return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(_evas_engine_context(evas_gl->evas), EVAS_GL_GLES_2_X); } -EAPI Evas_GL_API * +EVAS_API Evas_GL_API * evas_gl_context_api_get(Evas_GL *evas_gl, Evas_GL_Context *ctx) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -648,7 +648,7 @@ evas_gl_context_api_get(Evas_GL *evas_gl, Evas_GL_Context *ctx) return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(_evas_engine_context(evas_gl->evas), ctx->version); } -EAPI int +EVAS_API int evas_gl_rotation_get(Evas_GL *evas_gl) { MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); @@ -661,7 +661,7 @@ evas_gl_rotation_get(Evas_GL *evas_gl) return evas_gl->evas->engine.func->gl_rotation_angle_get(_evas_engine_context(evas_gl->evas)); } -EAPI int +EVAS_API int evas_gl_error_get(Evas_GL *evas_gl) { int err; @@ -684,7 +684,7 @@ end: return err; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_gl_surface_query(Evas_GL *evas_gl, Evas_GL_Surface *surface, int attribute, void *value) { if (!evas_gl) return EINA_FALSE; diff --git a/src/lib/evas/canvas/evas_grid_eo.c b/src/lib/evas/canvas/evas_grid_eo.c index 609edd6168..0a6218a865 100644 --- a/src/lib/evas/canvas/evas_grid_eo.c +++ b/src/lib/evas/canvas/evas_grid_eo.c @@ -1,43 +1,43 @@ void _evas_grid_grid_size_set(Eo *obj, Evas_Grid_Data *pd, int w, int h); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_grid_size_set, EFL_FUNC_CALL(w, h), int w, int h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_grid_size_set, EFL_FUNC_CALL(w, h), int w, int h); void _evas_grid_grid_size_get(const Eo *obj, Evas_Grid_Data *pd, int *w, int *h); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_grid_size_get, EFL_FUNC_CALL(w, h), int *w, int *h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_grid_size_get, EFL_FUNC_CALL(w, h), int *w, int *h); Eina_List *_evas_grid_children_get(const Eo *obj, Evas_Grid_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_grid_children_get, Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_grid_children_get, Eina_List *, NULL); Eina_Accessor *_evas_grid_accessor_new(const Eo *obj, Evas_Grid_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_grid_accessor_new, Eina_Accessor *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_grid_accessor_new, Eina_Accessor *, NULL); void _evas_grid_clear(Eo *obj, Evas_Grid_Data *pd, Eina_Bool clear); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_grid_clear, EFL_FUNC_CALL(clear), Eina_Bool clear); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_grid_clear, EFL_FUNC_CALL(clear), Eina_Bool clear); Eina_Iterator *_evas_grid_iterator_new(const Eo *obj, Evas_Grid_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_grid_iterator_new, Eina_Iterator *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_grid_iterator_new, Eina_Iterator *, NULL); Efl_Canvas_Object *_evas_grid_add_to(Eo *obj, Evas_Grid_Data *pd); -EOAPI EFL_FUNC_BODY(evas_obj_grid_add_to, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_obj_grid_add_to, Efl_Canvas_Object *, NULL); Eina_Bool _evas_grid_unpack(Eo *obj, Evas_Grid_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_grid_unpack, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_grid_unpack, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); Eina_Bool _evas_grid_pack_get(const Eo *obj, Evas_Grid_Data *pd, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_grid_pack_get, Eina_Bool, 0, EFL_FUNC_CALL(child, x, y, w, h), Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_grid_pack_get, Eina_Bool, 0, EFL_FUNC_CALL(child, x, y, w, h), Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); Eina_Bool _evas_grid_pack(Eo *obj, Evas_Grid_Data *pd, Efl_Canvas_Object *child, int x, int y, int w, int h); -EOAPI EFL_FUNC_BODYV(evas_obj_grid_pack, Eina_Bool, 0, EFL_FUNC_CALL(child, x, y, w, h), Efl_Canvas_Object *child, int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_grid_pack, Eina_Bool, 0, EFL_FUNC_CALL(child, x, y, w, h), Efl_Canvas_Object *child, int x, int y, int w, int h); Efl_Object *_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *pd); diff --git a/src/lib/evas/canvas/evas_grid_eo.h b/src/lib/evas/canvas/evas_grid_eo.h index 29477cc2c4..f6ce03d5b5 100644 --- a/src/lib/evas/canvas/evas_grid_eo.h +++ b/src/lib/evas/canvas/evas_grid_eo.h @@ -19,7 +19,7 @@ typedef Eo Evas_Grid; */ #define EVAS_GRID_CLASS evas_grid_class_get() -EWAPI const Efl_Class *evas_grid_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_grid_class_get(void) EINA_CONST; /** * @brief Set the virtual resolution for the grid @@ -32,7 +32,7 @@ EWAPI const Efl_Class *evas_grid_class_get(void) EINA_CONST; * * @ingroup Evas_Grid */ -EOAPI void evas_obj_grid_size_set(Eo *obj, int w, int h); +EVAS_API EVAS_API_WEAK void evas_obj_grid_size_set(Eo *obj, int w, int h); /** * @brief Get the current virtual resolution @@ -47,7 +47,7 @@ EOAPI void evas_obj_grid_size_set(Eo *obj, int w, int h); * * @ingroup Evas_Grid */ -EOAPI void evas_obj_grid_size_get(const Eo *obj, int *w, int *h); +EVAS_API EVAS_API_WEAK void evas_obj_grid_size_get(const Eo *obj, int *w, int *h); /** * @brief Get the list of children for the grid. @@ -65,7 +65,7 @@ EOAPI void evas_obj_grid_size_get(const Eo *obj, int *w, int *h); * * @ingroup Evas_Grid */ -EOAPI Eina_List *evas_obj_grid_children_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_List *evas_obj_grid_children_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get an accessor to get random access to the list of children for the @@ -81,7 +81,7 @@ EOAPI Eina_List *evas_obj_grid_children_get(const Eo *obj) EINA_WARN_UNUSED_RESU * * @ingroup Evas_Grid */ -EOAPI Eina_Accessor *evas_obj_grid_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Accessor *evas_obj_grid_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Faster way to remove all child objects from a grid object. @@ -93,7 +93,7 @@ EOAPI Eina_Accessor *evas_obj_grid_accessor_new(const Eo *obj) EINA_WARN_UNUSED_ * * @ingroup Evas_Grid */ -EOAPI void evas_obj_grid_clear(Eo *obj, Eina_Bool clear); +EVAS_API EVAS_API_WEAK void evas_obj_grid_clear(Eo *obj, Eina_Bool clear); /** * @brief Get an iterator to walk the list of children for the grid. @@ -108,7 +108,7 @@ EOAPI void evas_obj_grid_clear(Eo *obj, Eina_Bool clear); * * @ingroup Evas_Grid */ -EOAPI Eina_Iterator *evas_obj_grid_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Iterator *evas_obj_grid_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Create a grid that is child of a given element parent. @@ -123,7 +123,7 @@ EOAPI Eina_Iterator *evas_obj_grid_iterator_new(const Eo *obj) EINA_WARN_UNUSED_ * * @ingroup Evas_Grid */ -EOAPI Efl_Canvas_Object *evas_obj_grid_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_grid_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Remove child from grid. @@ -141,7 +141,7 @@ EOAPI Efl_Canvas_Object *evas_obj_grid_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; * * @ingroup Evas_Grid */ -EOAPI Eina_Bool evas_obj_grid_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_grid_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get the pack options for a grid child @@ -162,7 +162,7 @@ EOAPI Eina_Bool evas_obj_grid_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_ARG * * @ingroup Evas_Grid */ -EOAPI Eina_Bool evas_obj_grid_pack_get(const Eo *obj, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_grid_pack_get(const Eo *obj, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); /** * @brief Add a new child to a grid object. @@ -180,6 +180,6 @@ EOAPI Eina_Bool evas_obj_grid_pack_get(const Eo *obj, Efl_Canvas_Object *child, * * @ingroup Evas_Grid */ -EOAPI Eina_Bool evas_obj_grid_pack(Eo *obj, Efl_Canvas_Object *child, int x, int y, int w, int h) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_grid_pack(Eo *obj, Efl_Canvas_Object *child, int x, int y, int w, int h) EINA_ARG_NONNULL(2); #endif diff --git a/src/lib/evas/canvas/evas_grid_eo.legacy.c b/src/lib/evas/canvas/evas_grid_eo.legacy.c index 5447f1c390..44738579ef 100644 --- a/src/lib/evas/canvas/evas_grid_eo.legacy.c +++ b/src/lib/evas/canvas/evas_grid_eo.legacy.c @@ -1,59 +1,59 @@ -EAPI void +EVAS_API void evas_object_grid_size_set(Evas_Grid *obj, int w, int h) { evas_obj_grid_size_set(obj, w, h); } -EAPI void +EVAS_API void evas_object_grid_size_get(const Evas_Grid *obj, int *w, int *h) { evas_obj_grid_size_get(obj, w, h); } -EAPI Eina_List * +EVAS_API Eina_List * evas_object_grid_children_get(const Evas_Grid *obj) { return evas_obj_grid_children_get(obj); } -EAPI Eina_Accessor * +EVAS_API Eina_Accessor * evas_object_grid_accessor_new(const Evas_Grid *obj) { return evas_obj_grid_accessor_new(obj); } -EAPI void +EVAS_API void evas_object_grid_clear(Evas_Grid *obj, Eina_Bool clear) { evas_obj_grid_clear(obj, clear); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_object_grid_iterator_new(const Evas_Grid *obj) { return evas_obj_grid_iterator_new(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_grid_add_to(Evas_Grid *obj) { return evas_obj_grid_add_to(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_grid_unpack(Evas_Grid *obj, Efl_Canvas_Object *child) { return evas_obj_grid_unpack(obj, child); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_grid_pack_get(const Evas_Grid *obj, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h) { return evas_obj_grid_pack_get(obj, child, x, y, w, h); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_grid_pack(Evas_Grid *obj, Efl_Canvas_Object *child, int x, int y, int w, int h) { return evas_obj_grid_pack(obj, child, x, y, w, h); diff --git a/src/lib/evas/canvas/evas_grid_eo.legacy.h b/src/lib/evas/canvas/evas_grid_eo.legacy.h index 9b48bf9b18..4b1e89c32e 100644 --- a/src/lib/evas/canvas/evas_grid_eo.legacy.h +++ b/src/lib/evas/canvas/evas_grid_eo.legacy.h @@ -25,7 +25,7 @@ typedef Eo Evas_Grid; * * @ingroup Evas_Object_Grid_Group */ -EAPI void evas_object_grid_size_set(Evas_Grid *obj, int w, int h); +EVAS_API void evas_object_grid_size_set(Evas_Grid *obj, int w, int h); /** * @brief Get the current virtual resolution @@ -40,7 +40,7 @@ EAPI void evas_object_grid_size_set(Evas_Grid *obj, int w, int h); * * @ingroup Evas_Object_Grid_Group */ -EAPI void evas_object_grid_size_get(const Evas_Grid *obj, int *w, int *h); +EVAS_API void evas_object_grid_size_get(const Evas_Grid *obj, int *w, int *h); /** * @brief Get the list of children for the grid. @@ -58,7 +58,7 @@ EAPI void evas_object_grid_size_get(const Evas_Grid *obj, int *w, int *h); * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_List *evas_object_grid_children_get(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_List *evas_object_grid_children_get(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get an accessor to get random access to the list of children for the @@ -74,7 +74,7 @@ EAPI Eina_List *evas_object_grid_children_get(const Evas_Grid *obj) EINA_WARN_UN * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_Accessor *evas_object_grid_accessor_new(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Accessor *evas_object_grid_accessor_new(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Faster way to remove all child objects from a grid object. @@ -86,7 +86,7 @@ EAPI Eina_Accessor *evas_object_grid_accessor_new(const Evas_Grid *obj) EINA_WAR * * @ingroup Evas_Object_Grid_Group */ -EAPI void evas_object_grid_clear(Evas_Grid *obj, Eina_Bool clear); +EVAS_API void evas_object_grid_clear(Evas_Grid *obj, Eina_Bool clear); /** * @brief Get an iterator to walk the list of children for the grid. @@ -101,7 +101,7 @@ EAPI void evas_object_grid_clear(Evas_Grid *obj, Eina_Bool clear); * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_Iterator *evas_object_grid_iterator_new(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Iterator *evas_object_grid_iterator_new(const Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Create a grid that is child of a given element parent. @@ -116,7 +116,7 @@ EAPI Eina_Iterator *evas_object_grid_iterator_new(const Evas_Grid *obj) EINA_WAR * * @ingroup Evas_Object_Grid_Group */ -EAPI Efl_Canvas_Object *evas_object_grid_add_to(Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_grid_add_to(Evas_Grid *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Remove child from grid. @@ -134,7 +134,7 @@ EAPI Efl_Canvas_Object *evas_object_grid_add_to(Evas_Grid *obj) EINA_WARN_UNUSED * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_Bool evas_object_grid_unpack(Evas_Grid *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API Eina_Bool evas_object_grid_unpack(Evas_Grid *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Get the pack options for a grid child @@ -155,7 +155,7 @@ EAPI Eina_Bool evas_object_grid_unpack(Evas_Grid *obj, Efl_Canvas_Object *child) * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_Bool evas_object_grid_pack_get(const Evas_Grid *obj, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); +EVAS_API Eina_Bool evas_object_grid_pack_get(const Evas_Grid *obj, Efl_Canvas_Object *child, int *x, int *y, int *w, int *h); /** * @brief Add a new child to a grid object. @@ -173,6 +173,6 @@ EAPI Eina_Bool evas_object_grid_pack_get(const Evas_Grid *obj, Efl_Canvas_Object * * @ingroup Evas_Object_Grid_Group */ -EAPI Eina_Bool evas_object_grid_pack(Evas_Grid *obj, Efl_Canvas_Object *child, int x, int y, int w, int h) EINA_ARG_NONNULL(2); +EVAS_API Eina_Bool evas_object_grid_pack(Evas_Grid *obj, Efl_Canvas_Object *child, int x, int y, int w, int h) EINA_ARG_NONNULL(2); #endif diff --git a/src/lib/evas/canvas/evas_image_eo.h b/src/lib/evas/canvas/evas_image_eo.h index f7ca922fc6..6b75ffa11d 100644 --- a/src/lib/evas/canvas/evas_image_eo.h +++ b/src/lib/evas/canvas/evas_image_eo.h @@ -19,6 +19,6 @@ typedef Eo Evas_Image; */ #define EVAS_IMAGE_CLASS evas_image_class_get() -EWAPI const Efl_Class *evas_image_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_image_class_get(void) EINA_CONST; #endif diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index b993f61373..d02cd3220b 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -21,7 +21,7 @@ struct _Evas_Image_Legacy_Pixels_Entry void *image; }; -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_image_add(Evas *eo_e) { eo_e = evas_find(eo_e); @@ -31,7 +31,7 @@ evas_object_image_add(Evas *eo_e) efl_canvas_object_legacy_ctor(efl_added)); } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_image_filled_add(Evas *eo_e) { eo_e = evas_find(eo_e); @@ -40,7 +40,7 @@ evas_object_image_filled_add(Evas *eo_e) efl_canvas_object_legacy_ctor(efl_added)); } -EAPI void +EVAS_API void evas_object_image_memfile_set(Evas_Object *eo_obj, void *data, int size, char *format EINA_UNUSED, char *key) { Eina_File *f; @@ -53,7 +53,7 @@ evas_object_image_memfile_set(Evas_Object *eo_obj, void *data, int size, char *f eina_file_close(f); // close matching open OK } -EAPI void +EVAS_API void evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) @@ -62,7 +62,7 @@ evas_object_image_fill_set(Evas_Object *obj, _evas_image_fill_set(obj, efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS), x, y, w, h); } -EAPI void +EVAS_API void evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel) { EVAS_IMAGE_API(eo_obj); @@ -70,21 +70,21 @@ evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel) else _evas_image_load_async_start(eo_obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_filled_get(const Evas_Object *eo_obj) { EVAS_IMAGE_API(eo_obj, EINA_FALSE); return efl_gfx_fill_auto_get(eo_obj); } -EAPI void +EVAS_API void evas_object_image_filled_set(Evas_Object *eo_obj, Eina_Bool value) { EVAS_IMAGE_API(eo_obj); efl_gfx_fill_auto_set(eo_obj, value); } -EAPI void +EVAS_API void evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) @@ -99,63 +99,63 @@ evas_object_image_fill_get(const Evas_Object *obj, if (h) *h = r.h; } -EAPI void +EVAS_API void evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool alpha) { EVAS_IMAGE_API(obj); efl_gfx_buffer_alpha_set(obj, alpha); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_alpha_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return efl_gfx_buffer_alpha_get(obj); } -EAPI void +EVAS_API void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b) { EVAS_IMAGE_API(obj); efl_gfx_image_border_insets_set(obj, l, r, t, b); } -EAPI void +EVAS_API void evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b) { EVAS_IMAGE_API(obj); efl_gfx_image_border_insets_get(obj, l, r, t, b); } -EAPI void +EVAS_API void evas_object_image_border_scale_set(Evas_Object *obj, double scale) { EVAS_IMAGE_API(obj); efl_gfx_image_border_insets_scale_set(obj, scale); } -EAPI double +EVAS_API double evas_object_image_border_scale_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0.0); return efl_gfx_image_border_insets_scale_get(obj); } -EAPI void +EVAS_API void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill) { EVAS_IMAGE_API(obj); efl_gfx_image_center_fill_mode_set(obj, (Efl_Gfx_Center_Fill_Mode) fill); } -EAPI Evas_Border_Fill_Mode +EVAS_API Evas_Border_Fill_Mode evas_object_image_border_center_fill_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_NONE); return (Evas_Border_Fill_Mode) efl_gfx_image_center_fill_mode_get(obj); } -EAPI void +EVAS_API void evas_object_image_size_get(const Evas_Object *obj, int *w, int *h) { Eina_Size2D sz; @@ -165,14 +165,14 @@ evas_object_image_size_get(const Evas_Object *obj, int *w, int *h) if (h) *h = sz.h; } -EAPI Evas_Colorspace +EVAS_API Evas_Colorspace evas_object_image_colorspace_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_COLORSPACE_ARGB8888); return (Evas_Colorspace) efl_gfx_buffer_colorspace_get(obj); } -EAPI int +EVAS_API int evas_object_image_stride_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0); @@ -180,7 +180,7 @@ evas_object_image_stride_get(const Evas_Object *obj) return o->cur->image.stride; } -EAPI void +EVAS_API void evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h) { Eina_Rect r; @@ -190,35 +190,35 @@ evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h) efl_gfx_buffer_update_add(obj, &r); } -EAPI void +EVAS_API void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key) { EVAS_IMAGE_API(obj); efl_file_simple_load(obj, file, key); } -EAPI void +EVAS_API void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key) { EVAS_IMAGE_API(obj); efl_file_simple_get(obj, file, key); } -EAPI void +EVAS_API void evas_object_image_mmap_set(Evas_Object *obj, const Eina_File *f, const char *key) { EVAS_IMAGE_API(obj); efl_file_simple_mmap_load(obj, f, key); } -EAPI void +EVAS_API void evas_object_image_mmap_get(const Evas_Object *obj, const Eina_File **f, const char **key) { EVAS_IMAGE_API(obj); efl_file_simple_mmap_get(obj, f, key); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags) { char *encoding = NULL; @@ -256,168 +256,168 @@ evas_object_image_save(const Evas_Object *obj, const char *file, const char *key return ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_animated_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return _evas_image_animated_get(obj); } -EAPI void +EVAS_API void evas_object_image_animated_frame_set(Evas_Object *obj, int frame_index) { EVAS_IMAGE_API(obj); _evas_image_animated_frame_set(obj, frame_index); } -EAPI int +EVAS_API int evas_object_image_animated_frame_get(Evas_Object *obj) { EVAS_IMAGE_API(obj, 0); return _evas_image_animated_frame_get(obj); } -EAPI int +EVAS_API int evas_object_image_animated_frame_count_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0); return _evas_image_animated_frame_count_get(obj); } -EAPI Evas_Image_Animated_Loop_Hint +EVAS_API Evas_Image_Animated_Loop_Hint evas_object_image_animated_loop_type_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_IMAGE_ANIMATED_HINT_NONE); return (Evas_Image_Animated_Loop_Hint) _evas_image_animated_loop_type_get(obj); } -EAPI int +EVAS_API int evas_object_image_animated_loop_count_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0); return _evas_image_animated_loop_count_get(obj); } -EAPI double +EVAS_API double evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int frame_num) { EVAS_IMAGE_API(obj, 0.0); return _evas_image_animated_frame_duration_get(obj, start_frame, frame_num); } -EAPI void +EVAS_API void evas_object_image_load_size_set(Evas_Object *obj, int w, int h) { EVAS_IMAGE_API(obj); _evas_image_load_size_set(obj, w, h); } -EAPI void +EVAS_API void evas_object_image_load_size_get(const Evas_Object *obj, int *w, int *h) { EVAS_IMAGE_API(obj); _evas_image_load_size_get(obj, w, h); } -EAPI void +EVAS_API void evas_object_image_load_dpi_set(Evas_Object *obj, double dpi) { EVAS_IMAGE_API(obj); _evas_image_load_dpi_set(obj, dpi); } -EAPI double +EVAS_API double evas_object_image_load_dpi_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0.0); return _evas_image_load_dpi_get(obj); } -EAPI void +EVAS_API void evas_object_image_load_region_set(Evas_Object *obj, int x, int y, int w, int h) { EVAS_IMAGE_API(obj); _evas_image_load_region_set(obj, x, y, w, h); } -EAPI void +EVAS_API void evas_object_image_load_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h) { EVAS_IMAGE_API(obj); _evas_image_load_region_get(obj, x, y, w, h); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_region_support_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return _evas_image_load_region_support_get(obj); } -EAPI void +EVAS_API void evas_object_image_load_orientation_set(Evas_Object *obj, Eina_Bool enable) { EVAS_IMAGE_API(obj); _evas_image_load_orientation_set(obj, enable); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_load_orientation_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return _evas_image_load_orientation_get(obj); } -EAPI void +EVAS_API void evas_object_image_load_scale_down_set(Evas_Object *obj, int scale_down) { EVAS_IMAGE_API(obj); _evas_image_load_scale_down_set(obj, scale_down); } -EAPI int +EVAS_API int evas_object_image_load_scale_down_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 1); return _evas_image_load_scale_down_get(obj); } -EAPI void +EVAS_API void evas_object_image_load_head_skip_set(Evas_Object *obj, Eina_Bool skip) { EVAS_IMAGE_API(obj); _evas_image_load_head_skip_set(obj, skip); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_load_head_skip_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return _evas_image_load_head_skip_get(obj); } -EAPI Evas_Load_Error +EVAS_API Evas_Load_Error evas_object_image_load_error_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_LOAD_ERROR_GENERIC); return _efl_gfx_image_load_error_to_evas_load_error(efl_gfx_image_load_error_get(obj)); } -EAPI void +EVAS_API void evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale) { EVAS_IMAGE_API(obj); efl_gfx_image_smooth_scale_set(obj, smooth_scale); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_smooth_scale_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EINA_FALSE); return efl_gfx_image_smooth_scale_get(obj); } -EAPI void +EVAS_API void evas_object_image_orient_set(Evas_Object *obj, Evas_Image_Orient orient) { EVAS_IMAGE_API(obj); @@ -426,7 +426,7 @@ evas_object_image_orient_set(Evas_Object *obj, Evas_Image_Orient orient) _evas_image_orientation_set(obj, o, orient); } -EAPI Evas_Image_Orient +EVAS_API Evas_Image_Orient evas_object_image_orient_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_IMAGE_ORIENT_NONE); @@ -436,7 +436,7 @@ evas_object_image_orient_get(const Evas_Object *obj) return o->cur->orient; } -EAPI void +EVAS_API void evas_object_image_snapshot_set(Evas_Object *eo, Eina_Bool s) { EVAS_IMAGE_API(eo); @@ -450,7 +450,7 @@ evas_object_image_snapshot_set(Evas_Object *eo, Eina_Bool s) EINA_COW_STATE_WRITE_END(obj, state_write, cur); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_snapshot_get(const Evas_Object *eo) { EVAS_IMAGE_API(eo, EINA_FALSE); @@ -459,84 +459,84 @@ evas_object_image_snapshot_get(const Evas_Object *eo) return obj->cur->snapshot; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_source_set(Evas_Object *eo, Evas_Object *src) { EVAS_IMAGE_API(eo, EINA_FALSE); return _evas_image_proxy_source_set(eo, src); } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_image_source_get(const Evas_Object *eo) { EVAS_IMAGE_API(eo, NULL); return _evas_image_proxy_source_get(eo); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_source_unset(Evas_Object *eo_obj) { EVAS_IMAGE_API(eo_obj, EINA_FALSE); return _evas_image_proxy_source_set(eo_obj, NULL); } -EAPI void +EVAS_API void evas_object_image_source_clip_set(Evas_Object *eo, Eina_Bool source_clip) { EVAS_IMAGE_API(eo); _evas_image_proxy_source_clip_set(eo, source_clip); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_source_clip_get(const Evas_Object *eo) { EVAS_IMAGE_API(eo, EINA_FALSE); return _evas_image_proxy_source_clip_get(eo); } -EAPI void +EVAS_API void evas_object_image_source_events_set(Evas_Object *eo, Eina_Bool repeat) { EVAS_IMAGE_API(eo); _evas_image_proxy_source_events_set(eo, repeat); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_source_events_get(const Evas_Object *eo) { EVAS_IMAGE_API(eo, EINA_FALSE); return _evas_image_proxy_source_events_get(eo); } -EAPI void +EVAS_API void evas_object_image_content_hint_set(Evas_Object *obj, Evas_Image_Content_Hint hint) { EVAS_IMAGE_API(obj); efl_gfx_image_content_hint_set(obj, (Efl_Gfx_Image_Content_Hint)hint); } -EAPI Evas_Image_Content_Hint +EVAS_API Evas_Image_Content_Hint evas_object_image_content_hint_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_IMAGE_CONTENT_HINT_NONE); return (Evas_Image_Content_Hint)efl_gfx_image_content_hint_get(obj); } -EAPI void +EVAS_API void evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint) { EVAS_IMAGE_API(obj); return efl_gfx_image_scale_hint_set(obj, (Efl_Gfx_Image_Scale_Hint) hint); } -EAPI Evas_Image_Scale_Hint +EVAS_API Evas_Image_Scale_Hint evas_object_image_scale_hint_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, EVAS_IMAGE_SCALE_HINT_NONE); return (Evas_Image_Scale_Hint) efl_gfx_image_scale_hint_get(obj); } -EAPI void +EVAS_API void evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *surf) { EVAS_IMAGE_API(eo_obj); @@ -553,14 +553,14 @@ evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface *s } } -EAPI Evas_Native_Surface * +EVAS_API Evas_Native_Surface * evas_object_image_native_surface_get(const Evas_Object *eo_obj) { EVAS_IMAGE_API(eo_obj, NULL); return _evas_image_native_surface_get(eo_obj); } -EAPI void +EVAS_API void evas_object_image_pixels_get_callback_set(Eo *eo_obj, Evas_Object_Image_Pixels_Get_Cb func, void *data) { EVAS_IMAGE_API(eo_obj); @@ -577,7 +577,7 @@ evas_object_image_pixels_get_callback_set(Eo *eo_obj, Evas_Object_Image_Pixels_G EINA_COW_PIXEL_WRITE_END(o, pixi_write); } -EAPI void +EVAS_API void evas_object_image_pixels_dirty_set(Eo *eo_obj, Eina_Bool dirty) { EVAS_IMAGE_API(eo_obj); @@ -596,7 +596,7 @@ evas_object_image_pixels_dirty_set(Eo *eo_obj, Eina_Bool dirty) evas_object_change(eo_obj, obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_pixels_dirty_get(const Eo *eo_obj) { EVAS_IMAGE_API(eo_obj, EINA_FALSE); @@ -606,7 +606,7 @@ evas_object_image_pixels_dirty_get(const Eo *eo_obj) return (o->dirty_pixels ? 1 : 0); } -EAPI void +EVAS_API void evas_object_image_data_set(Eo *eo_obj, void *data) { EVAS_IMAGE_API(eo_obj); @@ -713,7 +713,7 @@ _image_to_free_del_cb(void *data) free(px_entry); } -EAPI void* +EVAS_API void* evas_object_image_data_get(const Eo *eo_obj, Eina_Bool for_writing) { EVAS_IMAGE_API(eo_obj, NULL); @@ -795,7 +795,7 @@ error: return NULL; } -EAPI void +EVAS_API void evas_object_image_data_copy_set(Eo *eo_obj, void *data) { EVAS_IMAGE_API(eo_obj); @@ -843,7 +843,7 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data) } /* Evas_Object equivalent: pixels_set(null, w, h, cspace) to (re)allocate an image */ -EAPI void +EVAS_API void evas_object_image_size_set(Evas_Object *eo_obj, int w, int h) { EVAS_IMAGE_API(eo_obj); @@ -908,7 +908,7 @@ evas_object_image_size_set(Evas_Object *eo_obj, int w, int h) } /* Evas_Object equivalent: pixels_set(null, w, h, cspace) to (re)allocate an image */ -EAPI void +EVAS_API void evas_object_image_colorspace_set(Evas_Object *eo_obj, Evas_Colorspace cspace) { EVAS_IMAGE_API(eo_obj); @@ -929,7 +929,7 @@ evas_object_image_colorspace_set(Evas_Object *eo_obj, Evas_Colorspace cspace) /* old video surfaces */ -EAPI void +EVAS_API void evas_object_image_video_surface_set(Evas_Object *eo_obj, Evas_Video_Surface *surf) { EVAS_IMAGE_LEGACY_API(eo_obj); @@ -990,7 +990,7 @@ evas_object_image_video_surface_set(Evas_Object *eo_obj, Evas_Video_Surface *sur } } -EAPI const Evas_Video_Surface* +EVAS_API const Evas_Video_Surface* evas_object_image_video_surface_get(const Evas_Object *eo_obj) { EVAS_IMAGE_LEGACY_API(eo_obj, NULL); @@ -999,7 +999,7 @@ evas_object_image_video_surface_get(const Evas_Object *eo_obj) return (!o->video_surface ? NULL : &o->pixels->video); } -EAPI void +EVAS_API void evas_object_image_video_surface_caps_set(Evas_Object *eo_obj, unsigned int caps) { EVAS_IMAGE_LEGACY_API(eo_obj); @@ -1018,7 +1018,7 @@ evas_object_image_video_surface_caps_set(Evas_Object *eo_obj, unsigned int caps) EINA_COW_PIXEL_WRITE_END(o, pixi_write) } -EAPI unsigned int +EVAS_API unsigned int evas_object_image_video_surface_caps_get(const Evas_Object *eo_obj) { EVAS_IMAGE_LEGACY_API(eo_obj, 0); @@ -1032,7 +1032,7 @@ evas_object_image_video_surface_caps_get(const Evas_Object *eo_obj) } /* deprecated */ -EAPI void +EVAS_API void evas_object_image_fill_spread_set(Evas_Object *obj EINA_UNUSED, Evas_Fill_Spread spread) { /* not implemented! */ @@ -1041,14 +1041,14 @@ evas_object_image_fill_spread_set(Evas_Object *obj EINA_UNUSED, Evas_Fill_Spread } /* deprecated */ -EAPI Evas_Fill_Spread +EVAS_API Evas_Fill_Spread evas_object_image_fill_spread_get(const Evas_Object *obj EINA_UNUSED) { return EFL_GFX_FILL_REPEAT; } /* deprecated */ -EAPI void +EVAS_API void evas_object_image_source_visible_set(Evas_Object *eo, Eina_Bool visible) { /* FIXME: I'd love to remove this feature and replace by no_render. @@ -1085,7 +1085,7 @@ evas_object_image_source_visible_set(Evas_Object *eo, Eina_Bool visible) } /* deprecated */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_source_visible_get(const Evas_Object *eo) { /* FIXME: see evas_object_image_source_visible_set */ @@ -1106,7 +1106,7 @@ evas_object_image_source_visible_get(const Evas_Object *eo) } /* deprecated */ -EAPI void* +EVAS_API void* evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace) { EVAS_IMAGE_LEGACY_API(eo_obj, NULL); @@ -1147,7 +1147,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace) } /* deprecated */ -EAPI void +EVAS_API void evas_object_image_reload(Evas_Object *eo_obj) { EVAS_IMAGE_LEGACY_API(eo_obj); @@ -1185,7 +1185,7 @@ evas_object_image_reload(Evas_Object *eo_obj) } /* deprecated */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *pixels) { EVAS_IMAGE_LEGACY_API(eo_obj, EINA_FALSE); @@ -1262,7 +1262,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p return EINA_TRUE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_image_max_size_get(Eo *eo_e, int *w, int *h) { Eina_Size2D size; @@ -1278,7 +1278,7 @@ evas_image_max_size_get(Eo *eo_e, int *w, int *h) } /* deprecated */ -EAPI void +EVAS_API void evas_object_image_alpha_mask_set(Evas_Object *eo_obj EINA_UNUSED, Eina_Bool ismask EINA_UNUSED) { WRN("This function is not implemented, has never been and never will be."); diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c index 5a86a92ea7..624899d910 100644 --- a/src/lib/evas/canvas/evas_key.c +++ b/src/lib/evas/canvas/evas_key.c @@ -31,14 +31,14 @@ evas_key_lock_number(const Evas_Lock *l, const char *keyname) /* public calls */ -EAPI const Evas_Modifier* +EVAS_API const Evas_Modifier* evas_key_modifier_get(const Evas *eo_e) { EVAS_LEGACY_API(eo_e, e, NULL); return &(e->modifiers); } -EAPI const Evas_Lock* +EVAS_API const Evas_Lock* evas_key_lock_get(const Evas *eo_e) { EVAS_LEGACY_API(eo_e, e, NULL); @@ -60,7 +60,7 @@ _key_is_set(int n, Eina_Hash *masks, const Evas_Device *seat) return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_seat_key_modifier_is_set(const Evas_Modifier *m, const char *keyname, const Evas_Device *seat) { @@ -72,21 +72,21 @@ evas_seat_key_modifier_is_set(const Evas_Modifier *m, const char *keyname, return _key_is_set(evas_key_modifier_number(m, keyname), m->masks, seat); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname) { EINA_SAFETY_ON_NULL_RETURN_VAL(m, EINA_FALSE); return evas_seat_key_modifier_is_set(m, keyname, NULL); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_key_lock_is_set(const Evas_Lock *l, const char *keyname) { EINA_SAFETY_ON_NULL_RETURN_VAL(l, EINA_FALSE); return evas_seat_key_lock_is_set(l, keyname, NULL); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_seat_key_lock_is_set(const Evas_Lock *l, const char *keyname, const Evas_Device *seat) { @@ -267,7 +267,7 @@ _evas_canvas_key_lock_off(Eo *eo_e, Evas_Public_Data *e, const char *keyname) /* errr need to add key grabbing/ungrabbing calls - missing modifier stuff. */ -EAPI Evas_Modifier_Mask +EVAS_API Evas_Modifier_Mask evas_key_modifier_mask_get(const Evas *eo_e, const char *keyname) { int n; diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c index 8ff29be943..82292666a6 100644 --- a/src/lib/evas/canvas/evas_key_grab.c +++ b/src/lib/evas/canvas/evas_key_grab.c @@ -243,7 +243,7 @@ _efl_canvas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, // Legacy API -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_key_grab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) @@ -256,7 +256,7 @@ evas_object_key_grab(Evas_Object *eo_obj, const char *keyname, return _object_key_grab(eo_obj, obj, keyname, modifiers, not_modifiers, exclusive); } -EAPI void +EVAS_API void evas_object_key_ungrab(Efl_Canvas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) { diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index d4e2eb3469..3c0898d0ab 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -208,7 +208,7 @@ _evas_object_layer_set_child(Evas_Object_Protected_Data *obj, Evas_Object_Protec /* public functions */ -EAPI void +EVAS_API void evas_object_layer_set(Evas_Object *obj, short l) { efl_gfx_stack_layer_set((Evas_Object *)obj, l); @@ -265,7 +265,7 @@ _efl_canvas_object_efl_gfx_stack_layer_set(Eo *eo_obj, Evas_Object_Protected_Dat evas_object_inform_call_restack(eo_obj, obj); } -EAPI short +EVAS_API short evas_object_layer_get(const Evas_Object *obj) { return efl_gfx_stack_layer_get((Evas_Object *)obj); diff --git a/src/lib/evas/canvas/evas_line_eo.c b/src/lib/evas/canvas/evas_line_eo.c index 3199d53e2d..8b6ff5ca21 100644 --- a/src/lib/evas/canvas/evas_line_eo.c +++ b/src/lib/evas/canvas/evas_line_eo.c @@ -1,11 +1,11 @@ void _evas_line_xy_set(Eo *obj, Evas_Line_Data *pd, int x1, int y1, int x2, int y2); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_line_xy_set, EFL_FUNC_CALL(x1, y1, x2, y2), int x1, int y1, int x2, int y2); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_line_xy_set, EFL_FUNC_CALL(x1, y1, x2, y2), int x1, int y1, int x2, int y2); void _evas_line_xy_get(const Eo *obj, Evas_Line_Data *pd, int *x1, int *y1, int *x2, int *y2); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_line_xy_get, EFL_FUNC_CALL(x1, y1, x2, y2), int *x1, int *y1, int *x2, int *y2); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_line_xy_get, EFL_FUNC_CALL(x1, y1, x2, y2), int *x1, int *y1, int *x2, int *y2); Efl_Object *_evas_line_efl_object_constructor(Eo *obj, Evas_Line_Data *pd); diff --git a/src/lib/evas/canvas/evas_line_eo.h b/src/lib/evas/canvas/evas_line_eo.h index c22e89e5fe..9504881ced 100644 --- a/src/lib/evas/canvas/evas_line_eo.h +++ b/src/lib/evas/canvas/evas_line_eo.h @@ -19,7 +19,7 @@ typedef Eo Evas_Line; */ #define EVAS_LINE_CLASS evas_line_class_get() -EWAPI const Efl_Class *evas_line_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_line_class_get(void) EINA_CONST; /** * @brief Sets the coordinates of the end points of the given evas line object. @@ -34,7 +34,7 @@ EWAPI const Efl_Class *evas_line_class_get(void) EINA_CONST; * * @ingroup Evas_Line */ -EOAPI void evas_obj_line_xy_set(Eo *obj, int x1, int y1, int x2, int y2); +EVAS_API EVAS_API_WEAK void evas_obj_line_xy_set(Eo *obj, int x1, int y1, int x2, int y2); /** * @brief Retrieves the coordinates of the end points of the given evas line @@ -48,6 +48,6 @@ EOAPI void evas_obj_line_xy_set(Eo *obj, int x1, int y1, int x2, int y2); * * @ingroup Evas_Line */ -EOAPI void evas_obj_line_xy_get(const Eo *obj, int *x1, int *y1, int *x2, int *y2); +EVAS_API EVAS_API_WEAK void evas_obj_line_xy_get(const Eo *obj, int *x1, int *y1, int *x2, int *y2); #endif diff --git a/src/lib/evas/canvas/evas_line_eo.legacy.c b/src/lib/evas/canvas/evas_line_eo.legacy.c index 5c879056ed..9307c34526 100644 --- a/src/lib/evas/canvas/evas_line_eo.legacy.c +++ b/src/lib/evas/canvas/evas_line_eo.legacy.c @@ -1,11 +1,11 @@ -EAPI void +EVAS_API void evas_object_line_xy_set(Evas_Line *obj, int x1, int y1, int x2, int y2) { evas_obj_line_xy_set(obj, x1, y1, x2, y2); } -EAPI void +EVAS_API void evas_object_line_xy_get(const Evas_Line *obj, int *x1, int *y1, int *x2, int *y2) { evas_obj_line_xy_get(obj, x1, y1, x2, y2); diff --git a/src/lib/evas/canvas/evas_line_eo.legacy.h b/src/lib/evas/canvas/evas_line_eo.legacy.h index 556174c8b2..9fc3218338 100644 --- a/src/lib/evas/canvas/evas_line_eo.legacy.h +++ b/src/lib/evas/canvas/evas_line_eo.legacy.h @@ -27,7 +27,7 @@ typedef Eo Evas_Line; * * @ingroup Evas_Object_Line_Group */ -EAPI void evas_object_line_xy_set(Evas_Line *obj, int x1, int y1, int x2, int y2); +EVAS_API void evas_object_line_xy_set(Evas_Line *obj, int x1, int y1, int x2, int y2); /** * @brief Retrieves the coordinates of the end points of the given evas line @@ -41,6 +41,6 @@ EAPI void evas_object_line_xy_set(Evas_Line *obj, int x1, int y1, int x2, int y2 * * @ingroup Evas_Object_Line_Group */ -EAPI void evas_object_line_xy_get(const Evas_Line *obj, int *x1, int *y1, int *x2, int *y2); +EVAS_API void evas_object_line_xy_get(const Evas_Line *obj, int *x1, int *y1, int *x2, int *y2); #endif diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 40d242339a..4bdc7e36dd 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -19,24 +19,24 @@ #define MY_CLASS EVAS_CANVAS_CLASS #ifdef LKDEBUG -EAPI Eina_Bool lockdebug = EINA_FALSE; -EAPI int lockmax = 0; +EVAS_API Eina_Bool lockdebug = EINA_FALSE; +EVAS_API int lockmax = 0; #endif static int _evas_init_count = 0; int _evas_log_dom_global = -1; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION = 0; -EAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION = 0; +EVAS_API Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE = 0; #define NUM_ERRORS 11 @@ -148,7 +148,7 @@ _utf8_to_markup(Eina_Content *from, const char *to_type) return ret; } -EAPI int +EVAS_API int evas_init(void) { if (++_evas_init_count != 1) @@ -235,7 +235,7 @@ shutdown_evil: return --_evas_init_count; } -EAPI int +EVAS_API int evas_shutdown(void) { if (_evas_init_count <= 0) @@ -305,7 +305,7 @@ evas_shutdown(void) } -EAPI Evas * +EVAS_API Evas * evas_new(void) { Evas_Object *eo_obj = efl_add(EVAS_CANVAS_CLASS, efl_main_loop_get()); @@ -387,7 +387,7 @@ _evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e) return eo_obj; } -EAPI void +EVAS_API void evas_free(Evas *eo_e) { if (!eo_e) return; @@ -673,7 +673,7 @@ _evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e) // It is now expected that the first output in the list is the default one // manipulated by this set of legacy API -EAPI Evas_Engine_Info * +EVAS_API Evas_Engine_Info * evas_engine_info_get(const Evas *obj) { if (!obj) return NULL; @@ -692,7 +692,7 @@ evas_engine_info_get(const Evas *obj) return efl_canvas_output_engine_info_get(output); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_engine_info_set(Evas *obj, Evas_Engine_Info *info) { if (!obj) return EINA_FALSE; @@ -750,7 +750,7 @@ _evas_canvas_default_device_get(const Eo *eo_e EINA_UNUSED, return NULL; } -EAPI int +EVAS_API int evas_render_method_lookup(const char *name) { Evas_Module *em; @@ -763,13 +763,13 @@ evas_render_method_lookup(const char *name) return em->id_engine; } -EAPI Eina_List * +EVAS_API Eina_List * evas_render_method_list(void) { return evas_module_engine_list(); } -EAPI void +EVAS_API void evas_render_method_list_free(Eina_List *list) { const char *s; @@ -777,7 +777,7 @@ evas_render_method_list_free(Eina_List *list) EINA_LIST_FREE(list, s) eina_stringshare_del(s); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_extension_can_load_get(const char *file) { const char *tmp; @@ -790,7 +790,7 @@ evas_object_image_extension_can_load_get(const char *file) return result; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_image_extension_can_load_fast_get(const char *file) { return evas_common_extension_can_load_get(file); @@ -970,7 +970,7 @@ _evas_unwalk(Evas_Public_Data *e) efl_unref(e->evas); } -EAPI const char * +EVAS_API const char * evas_load_error_str(Evas_Load_Error error) { switch (error) @@ -994,38 +994,38 @@ evas_load_error_str(Evas_Load_Error error) } } -EAPI void +EVAS_API void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b) { evas_common_convert_color_hsv_to_rgb(h, s, v, r, g, b); } -EAPI void +EVAS_API void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v) { evas_common_convert_color_rgb_to_hsv(r, g, b, h, s, v); } -EAPI void +EVAS_API void evas_color_argb_premul(int a, int *r, int *g, int *b) { evas_common_convert_color_argb_premul(a, r, g, b); } -EAPI void +EVAS_API void evas_color_argb_unpremul(int a, int *r, int *g, int *b) { evas_common_convert_color_argb_unpremul(a, r, g, b); } -EAPI void +EVAS_API void evas_data_argb_premul(unsigned int *data, unsigned int len) { if (!data || (len < 1)) return; evas_common_convert_argb_premul(data, len); } -EAPI void +EVAS_API void evas_data_argb_unpremul(unsigned int *data, unsigned int len) { if (!data || (len < 1)) return; @@ -1060,13 +1060,13 @@ evas_ector_get(Evas_Public_Data *e) return e->ector; } -EAPI Evas_BiDi_Direction +EVAS_API Evas_BiDi_Direction evas_language_direction_get(void) { return evas_common_language_direction_get(); } -EAPI void +EVAS_API void evas_language_reinit(void) { evas_common_language_reinit(); @@ -1102,7 +1102,7 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list) *list = eina_list_append(*list, obj->object); } -EAPI Eina_List * +EVAS_API Eina_List * _evas_canvas_image_data_unset(Evas *eo_e) { Evas_Public_Data *e = efl_data_scope_get(eo_e, MY_CLASS); @@ -1156,7 +1156,7 @@ _image_data_regenerate(Evas_Object *eo_obj) //else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,) } -EAPI void +EVAS_API void _evas_canvas_image_data_regenerate(Eina_List *list) { Evas_Object *eo_obj; @@ -1256,7 +1256,7 @@ _evas_canvas_efl_canvas_scene_image_max_size_get(const Eo *eo_e EINA_UNUSED, Eva /* Legacy deprecated functions */ -EAPI void +EVAS_API void evas_output_framespace_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { EVAS_TYPE_CHECK(eo_e); @@ -1275,7 +1275,7 @@ evas_output_framespace_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w, e->changed = 1; } -EAPI void +EVAS_API void evas_output_framespace_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { EVAS_TYPE_CHECK(eo_e); @@ -1288,7 +1288,7 @@ evas_output_framespace_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_ if (h) *h = e->framespace.h; } -EAPI void +EVAS_API void evas_output_method_set(Evas *eo_e, int render_method) { EVAS_TYPE_CHECK(eo_e); @@ -1360,7 +1360,7 @@ evas_output_method_set(Evas *eo_e, int render_method) EVAS_DEVICE_SUBCLASS_NONE); } -EAPI int +EVAS_API int evas_output_method_get(const Evas *eo_e) { EVAS_TYPE_CHECK(eo_e, RENDER_METHOD_INVALID); @@ -1370,7 +1370,7 @@ evas_output_method_get(const Evas *eo_e) return e->output.render_method; } -EAPI void +EVAS_API void evas_output_size_set(Evas *eo_e, int w, int h) { EVAS_TYPE_CHECK(eo_e); @@ -1398,7 +1398,7 @@ evas_output_size_set(Evas *eo_e, int w, int h) evas_render_invalidate(eo_e); } -EAPI void +EVAS_API void evas_output_size_get(const Evas *eo_e, int *w, int *h) { EVAS_TYPE_CHECK(eo_e); @@ -1409,7 +1409,7 @@ evas_output_size_get(const Evas *eo_e, int *w, int *h) if (h) *h = e->output.h; } -EAPI void +EVAS_API void evas_output_viewport_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { EVAS_TYPE_CHECK(eo_e); @@ -1437,7 +1437,7 @@ evas_output_viewport_set(Evas *eo_e, Evas_Coord x, Evas_Coord y, Evas_Coord w, E evas_event_callback_call(e->evas, EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, NULL); } -EAPI void +EVAS_API void evas_output_viewport_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { EVAS_TYPE_CHECK(eo_e); @@ -1606,7 +1606,7 @@ _efl_canvas_iterator_free(Efl_Canvas_Iterator *it) free(it); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * efl_canvas_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *list) { Efl_Canvas_Iterator *it; @@ -1662,14 +1662,14 @@ _evas_canvas_efl_canvas_scene_object_top_at_xy_get(const Eo *eo_e EINA_UNUSED, E return NULL; } -EAPI Evas_Object* +EVAS_API Evas_Object* evas_object_top_at_xy_get(Eo *eo_e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { Eina_Position2D pos = {x, y}; return efl_canvas_scene_object_top_at_xy_get(eo_e, pos, include_pass_events_objects, include_hidden_objects); } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_top_at_pointer_get(const Evas *eo_e) { Evas_Public_Data *e = efl_isa(eo_e, EVAS_CANVAS_CLASS) ? @@ -1721,7 +1721,7 @@ _evas_canvas_efl_canvas_scene_object_top_in_rectangle_get(const Eo *eo_e EINA_UN return NULL; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_top_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { return efl_canvas_scene_object_top_in_rectangle_get(obj, EINA_RECT(x, y, w, h), include_pass_events_objects, include_hidden_objects); @@ -1848,7 +1848,7 @@ _evas_canvas_efl_canvas_scene_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Eva return efl_canvas_iterator_create(eo_e, eina_list_iterator_new(l), l); } -EAPI Eina_List * +EVAS_API Eina_List * evas_objects_in_rectangle_get(const Evas_Canvas *eo_e, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { EVAS_LEGACY_API(eo_e, e, NULL); @@ -1941,7 +1941,7 @@ evas_font_object_rehint(Evas_Object *eo_obj) } } -EAPI void +EVAS_API void evas_font_hinting_set(Eo *eo_e, Evas_Font_Hinting_Flags hinting) { Evas_Layer *lay; @@ -1960,14 +1960,14 @@ evas_font_hinting_set(Eo *eo_e, Evas_Font_Hinting_Flags hinting) } } -EAPI Evas_Font_Hinting_Flags +EVAS_API Evas_Font_Hinting_Flags evas_font_hinting_get(const Evas *eo_e) { EVAS_LEGACY_API(eo_e, e, EVAS_FONT_HINTING_NONE); return e->hinting; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_font_hinting_can_hint(const Evas *eo_e, Evas_Font_Hinting_Flags hinting) { EVAS_LEGACY_API(eo_e, e, EINA_FALSE); @@ -1977,7 +1977,7 @@ evas_font_hinting_can_hint(const Evas *eo_e, Evas_Font_Hinting_Flags hinting) else return EINA_FALSE; } -EAPI void +EVAS_API void evas_font_available_list_free(Evas *eo_e, Eina_List *available) { EVAS_TYPE_CHECK(eo_e); @@ -1992,7 +1992,7 @@ _evas_canvas_efl_canvas_scene_group_objects_calculate(Eo *eo_e, Evas_Public_Data evas_call_smarts_calculate(eo_e); } -EAPI void +EVAS_API void evas_smart_objects_calculate(Eo *eo_e) { EVAS_TYPE_CHECK(eo_e); @@ -2005,7 +2005,7 @@ _evas_canvas_efl_canvas_scene_group_objects_calculating_get(const Eo *eo_e EINA_ return !!e->in_smart_calc; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_smart_objects_calculating_get(const Eo *obj) { EVAS_TYPE_CHECK(obj, EINA_FALSE); @@ -2017,23 +2017,23 @@ _evas_canvas_smart_objects_calculate_count_get(const Eo *eo_e EINA_UNUSED, Evas_ { return e->smart_calc_count; } -/* Legacy EAPI */ +/* Legacy EVAS_API */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_pointer_inside_get(const Evas *obj) { EVAS_TYPE_CHECK(obj, EINA_FALSE); return efl_canvas_pointer_inside_get(obj, NULL); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_pointer_inside_by_device_get(const Evas *obj, Eo *dev) { EVAS_TYPE_CHECK(obj, EINA_FALSE); return efl_canvas_pointer_inside_get(obj, dev); } -EAPI Eina_List* +EVAS_API Eina_List* evas_objects_at_xy_get(Eo *eo_e, int x, int y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) { EVAS_TYPE_CHECK(eo_e, NULL); @@ -2041,13 +2041,13 @@ evas_objects_at_xy_get(Eo *eo_e, int x, int y, Eina_Bool include_pass_events_obj } /* Internal EO APIs */ -EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE = EFL_EVENT_DESCRIPTION("render,flush,pre"); -EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST = EFL_EVENT_DESCRIPTION("render,flush,post"); -EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE = EFL_EVENT_DESCRIPTION("axis,update"); -EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE = EFL_EVENT_DESCRIPTION("viewport,resize"); #define CHECK_ADD(var, ev, member) \ diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c index 48782b2a21..4669595c7c 100644 --- a/src/lib/evas/canvas/evas_map.c +++ b/src/lib/evas/canvas/evas_map.c @@ -244,7 +244,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m) free(m); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_map_coords_get(const Evas_Map *m, double x, double y, double *mx, double *my, int grab) { @@ -512,7 +512,7 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, } } -EAPI void +EVAS_API void evas_object_map_enable_set(Eo *eo_obj, Eina_Bool enabled) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj); @@ -520,7 +520,7 @@ evas_object_map_enable_set(Eo *eo_obj, Eina_Bool enabled) _evas_object_map_enable_set(eo_obj, obj, enabled); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_map_enable_get(const Eo *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); @@ -528,7 +528,7 @@ evas_object_map_enable_get(const Eo *eo_obj) return obj->map->cur.usemap; } -EAPI void +EVAS_API void evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj); @@ -645,7 +645,7 @@ evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map) _evas_map_calc_map_geometry(eo_obj); } -EAPI const Evas_Map * +EVAS_API const Evas_Map * evas_object_map_get(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN((Eo *) eo_obj, NULL); @@ -654,7 +654,7 @@ evas_object_map_get(const Evas_Object *eo_obj) return obj->map->cur.map; } -EAPI Evas_Map * +EVAS_API Evas_Map * evas_map_new(int count) { if ((count <= 0) || (count % 4 != 0)) @@ -666,7 +666,7 @@ evas_map_new(int count) return _evas_map_new(count, EINA_FALSE); } -EAPI void +EVAS_API void evas_map_smooth_set(Evas_Map *m, Eina_Bool enabled) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -676,7 +676,7 @@ evas_map_smooth_set(Evas_Map *m, Eina_Bool enabled) m->smooth = enabled; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_map_smooth_get(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -686,7 +686,7 @@ evas_map_smooth_get(const Evas_Map *m) return m->smooth; } -EAPI void +EVAS_API void evas_map_alpha_set(Evas_Map *m, Eina_Bool enabled) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -696,7 +696,7 @@ evas_map_alpha_set(Evas_Map *m, Eina_Bool enabled) m->alpha = enabled; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_map_alpha_get(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -706,7 +706,7 @@ evas_map_alpha_get(const Evas_Map *m) return m->alpha; } -EAPI void +EVAS_API void evas_map_util_object_move_sync_set(Evas_Map *m, Eina_Bool enabled) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -721,7 +721,7 @@ evas_map_util_object_move_sync_set(Evas_Map *m, Eina_Bool enabled) m->move_sync.enabled = !!enabled; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_map_util_object_move_sync_get(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -731,7 +731,7 @@ evas_map_util_object_move_sync_get(const Evas_Map *m) return m->move_sync.enabled; } -EAPI Evas_Map * +EVAS_API Evas_Map * evas_map_dup(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -741,14 +741,14 @@ evas_map_dup(const Evas_Map *m) return _evas_map_dup(m); } -EAPI void +EVAS_API void evas_map_free(Evas_Map *m) { if (!m) return; _evas_map_free(NULL, m); } -EAPI int +EVAS_API int evas_map_count_get(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -762,7 +762,7 @@ evas_map_count_get(const Evas_Map *m) Rotation center position will be flickered by rounding problem. Now fixed in EO APIs. */ -EAPI void +EVAS_API void evas_map_point_coord_set(Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -772,7 +772,7 @@ evas_map_point_coord_set(Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_ _map_point_coord_set(m, idx, x, y, z); } -EAPI void +EVAS_API void evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z) { double dx, dy, dz; @@ -783,7 +783,7 @@ evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord * if (z) *z = lround(dz); } -EAPI void +EVAS_API void evas_map_point_image_uv_set(Evas_Map *m, int idx, double u, double v) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -798,7 +798,7 @@ evas_map_point_image_uv_set(Evas_Map *m, int idx, double u, double v) p->v = v; } -EAPI void +EVAS_API void evas_map_point_image_uv_get(const Evas_Map *m, int idx, double *u, double *v) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -818,7 +818,7 @@ evas_map_point_image_uv_get(const Evas_Map *m, int idx, double *u, double *v) if (v) *v = 0.0; } -EAPI void +EVAS_API void evas_map_point_color_set(Evas_Map *m, int idx, int r, int g, int b, int a) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -835,7 +835,7 @@ evas_map_point_color_set(Evas_Map *m, int idx, int r, int g, int b, int a) p->a = a; } -EAPI void +EVAS_API void evas_map_point_color_get(const Evas_Map *m, int idx, int *r, int *g, int *b, int *a) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -859,7 +859,7 @@ error: if (a) *a = 255; } -EAPI void +EVAS_API void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *eo_obj, Evas_Coord z) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -881,7 +881,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e obj->cur->geometry.w, obj->cur->geometry.h, z); } -EAPI void +EVAS_API void evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -903,7 +903,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj obj->cur->geometry.w, obj->cur->geometry.h, 0); } -EAPI void +EVAS_API void evas_map_util_points_populate_from_geometry(Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -918,7 +918,7 @@ evas_map_util_points_populate_from_geometry(Evas_Map *m, Evas_Coord x, Evas_Coor _evas_map_util_points_populate(m, x, y, w, h, z); } -EAPI void +EVAS_API void evas_map_util_points_color_set(Evas_Map *m, int r, int g, int b, int a) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -964,7 +964,7 @@ _map_util_rotate(Evas_Map *m, double degrees, double cx, double cy) } } -EAPI void +EVAS_API void evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -997,7 +997,7 @@ _map_util_zoom(Evas_Map *m, double zoomx, double zoomy, double cx, double cy) } } -EAPI void +EVAS_API void evas_map_util_zoom(Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); @@ -1073,7 +1073,7 @@ _map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, } } -EAPI void +EVAS_API void evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz) { @@ -1125,7 +1125,7 @@ _map_util_quat_rotate(Evas_Map *m, double qx, double qy, double qz, } } -EAPI void +EVAS_API void evas_map_util_quat_rotate(Evas_Map *m, double qx, double qy, double qz, double qw, double cx, double cy, double cz) { @@ -1211,7 +1211,7 @@ _map_util_3d_lighting(Evas_Map *m, } } -EAPI void +EVAS_API void evas_map_util_3d_lighting(Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab) @@ -1259,7 +1259,7 @@ _map_util_3d_perspective(Evas_Map *m, double px, double py, double z0, double fo } } -EAPI void +EVAS_API void evas_map_util_3d_perspective(Evas_Map *m, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc) @@ -1271,7 +1271,7 @@ evas_map_util_3d_perspective(Evas_Map *m, _map_util_3d_perspective(m, (double) px, (double) py, (double) z0, (double) foc); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_map_util_clockwise_get(Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c index 1db2e88b35..4ebf604cfc 100644 --- a/src/lib/evas/canvas/evas_name.c +++ b/src/lib/evas/canvas/evas_name.c @@ -1,7 +1,7 @@ #include "evas_common_private.h" #include "evas_private.h" -EAPI void +EVAS_API void evas_object_name_set(Evas_Object *eo_obj, const char *name) { Evas_Object_Protected_Data *obj = efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ? @@ -22,7 +22,7 @@ evas_object_name_set(Evas_Object *eo_obj, const char *name) } } -EAPI const char * +EVAS_API const char * evas_object_name_get(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ? @@ -60,7 +60,7 @@ _priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, i return NULL; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse) { return (!name ? NULL : _priv_evas_object_name_child_find(eo_obj, name, recurse)); diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index ac14eaf2b2..ca6a822360 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -477,7 +477,7 @@ _evas_box_efl_canvas_group_group_calculate(Eo *o, Evas_Object_Box_Data *priv) ERR("No layout function set for %p box.", o); } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_box_add(Evas *evas) { evas = evas_find(evas); @@ -509,13 +509,13 @@ _evas_box_add_to(Eo *parent, Evas_Object_Box_Data *_pd EINA_UNUSED) return o; } -EAPI void +EVAS_API void evas_object_box_smart_set(Evas_Object_Box_Api *api EINA_UNUSED) { return; } -EAPI const Evas_Object_Box_Api * +EVAS_API const Evas_Object_Box_Api * evas_object_box_smart_class_get(void) { return NULL; @@ -1920,7 +1920,7 @@ _evas_box_accessor_new(const Eo *o, Evas_Object_Box_Data *priv) return &it->accessor; } -EAPI Eina_List * +EVAS_API Eina_List * evas_object_box_children_get(const Evas_Object *o) { Eina_List *new_list = NULL, *l; @@ -1953,7 +1953,7 @@ _evas_box_option_property_id_get(const Eo *o EINA_UNUSED, Evas_Object_Box_Data * return -1; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...) { Eina_Bool ret; @@ -1967,7 +1967,7 @@ evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt, } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) { return evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args); @@ -1979,7 +1979,7 @@ _evas_box_option_property_vset(Eo *o EINA_UNUSED, Evas_Object_Box_Data *_pd EINA return EINA_FALSE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_option_property_get(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...) { Eina_Bool ret; @@ -1992,7 +1992,7 @@ evas_object_box_option_property_get(const Evas_Object *o, Evas_Object_Box_Option return ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args) { return evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args); diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 4b32d935a5..6509b0762c 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -273,7 +273,7 @@ _evas_object_grid_smart_set_user(Evas_Smart_Class *sc) sc->calculate = _evas_object_grid_smart_calculate; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_grid_add(Evas *evas) { evas = evas_find(evas); @@ -498,13 +498,13 @@ _evas_grid_efl_ui_i18n_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Ein } } -EAPI void +EVAS_API void evas_object_grid_mirrored_set(Evas_Grid *obj, Eina_Bool mirrored) { efl_ui_mirrored_set(obj, mirrored); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_grid_mirrored_get(const Evas_Grid *obj) { return efl_ui_mirrored_get(obj); diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index ef5ee4051f..b1a54f9f50 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -3,13 +3,13 @@ #include "evas_private.h" /* BEGIN: events to maintain compatibility with legacy */ -EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_SHOW = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_SHOW = EFL_EVENT_DESCRIPTION("show"); -EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_HIDE = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_HIDE = EFL_EVENT_DESCRIPTION("hide"); -EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_IMAGE_PRELOAD = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_IMAGE_PRELOAD = EFL_EVENT_DESCRIPTION("preload"); -EWAPI const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_IMAGE_UNLOAD = +EVAS_API EVAS_API_WEAK const Efl_Event_Description _EFL_GFX_ENTITY_EVENT_IMAGE_UNLOAD = EFL_EVENT_DESCRIPTION("unload"); /* END: events to maintain compatibility with legacy */ diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c index 95d3893d86..53eb6af75d 100644 --- a/src/lib/evas/canvas/evas_object_intercept.c +++ b/src/lib/evas/canvas/evas_object_intercept.c @@ -219,7 +219,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj, /* This is a legacy-only compatibility function. * Made public for other parts of EFL (elm, ecore_evas). */ -EWAPI Eina_Bool +EVAS_API EVAS_API_WEAK Eina_Bool _evas_object_intercept_call(Evas_Object *eo_obj, Evas_Object_Intercept_Cb_Type cb_type, int internal, ...) { @@ -256,7 +256,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj, /* public calls */ #define EVAS_OBJECT_INTERCEPT_CALLBACK_DEFINE(Up_Type, Lower_Type) \ - EAPI void \ + EVAS_API void \ evas_object_intercept_##Lower_Type##_callback_add(Evas_Object *eo_obj,\ Evas_Object_Intercept_##Up_Type##_Cb func, const void *data) \ { \ @@ -271,7 +271,7 @@ _evas_object_intercept_call_evas(Evas_Object_Protected_Data *obj, obj->interceptors->Lower_Type.data = (void *)data; \ } \ \ - EAPI void * \ + EVAS_API void * \ evas_object_intercept_##Lower_Type##_callback_del(Evas_Object *eo_obj,\ Evas_Object_Intercept_##Up_Type##_Cb func) \ { \ diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index ee085dcc5b..09aee281a9 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -84,7 +84,7 @@ static const Evas_Object_Func object_func = /* the actual api call to add a rect */ /* it has no other api calls as all properties are standard */ -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_line_add(Evas *e) { e = evas_find(e); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index fa25672d5a..e1b5839957 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -881,7 +881,7 @@ evas_object_was_inside(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Eva } /* routines apps will call */ -EAPI void +EVAS_API void evas_object_ref(Evas_Object *eo_obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -895,7 +895,7 @@ evas_object_ref(Evas_Object *eo_obj) obj->ref++; } -EAPI void +EVAS_API void evas_object_unref(Evas_Object *eo_obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -912,7 +912,7 @@ evas_object_unref(Evas_Object *eo_obj) } -EAPI int +EVAS_API int evas_object_ref_get(const Evas_Object *eo_obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -924,7 +924,7 @@ evas_object_ref_get(const Evas_Object *eo_obj) return obj->ref; } -EAPI void +EVAS_API void evas_object_del(Evas_Object *obj) { Evas_Object_Protected_Data *pd; @@ -1158,7 +1158,7 @@ _efl_canvas_object_efl_gfx_entity_geometry_set(Eo *obj, Evas_Object_Protected_Da efl_gfx_entity_size_set(obj, EINA_SIZE2D(r.w, r.h)); } -EAPI void +EVAS_API void evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -1167,7 +1167,7 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C efl_gfx_entity_geometry_set(eo_obj, EINA_RECT(x, y, w, h)); } -EAPI void +EVAS_API void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y)); @@ -1232,7 +1232,7 @@ _efl_canvas_object_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Object_Protected evas_object_inform_call_move(eo_obj, obj); } -EAPI void +EVAS_API void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { efl_gfx_entity_size_set((Evas_Object *)obj, EINA_SIZE2D(w, h)); @@ -1331,7 +1331,7 @@ _efl_canvas_object_efl_gfx_entity_geometry_get(const Eo *eo_obj EINA_UNUSED, Eva return (Eina_Rect) obj->cur->geometry; } -EAPI void +EVAS_API void evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { Eina_Rect r = efl_gfx_entity_geometry_get(eo_obj); @@ -1382,7 +1382,7 @@ _evas_object_size_hint_alloc(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protec } /* Legacy only */ -EAPI Evas_Display_Mode +EVAS_API Evas_Display_Mode evas_object_size_hint_display_mode_get(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); @@ -1392,7 +1392,7 @@ evas_object_size_hint_display_mode_get(const Evas_Object *eo_obj) } /* Legacy only */ -EAPI void +EVAS_API void evas_object_size_hint_display_mode_set(Eo *eo_obj, Evas_Display_Mode dispmode) { Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); @@ -1556,7 +1556,7 @@ _efl_canvas_object_efl_gfx_hint_hint_size_max_set(Eo *eo_obj, Evas_Object_Protec evas_object_inform_call_changed_size_hints(eo_obj, obj); } -EAPI void +EVAS_API void evas_object_size_hint_request_get(const Eo *eo_obj, Evas_Coord *w, Evas_Coord *h) { Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); @@ -1572,7 +1572,7 @@ evas_object_size_hint_request_get(const Eo *eo_obj, Evas_Coord *w, Evas_Coord *h if (h) *h = obj->size_hints->request.h; } -EAPI void +EVAS_API void evas_object_size_hint_request_set(Eo *eo_obj, Evas_Coord w, Evas_Coord h) { Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); @@ -1810,7 +1810,7 @@ _efl_canvas_object_efl_gfx_hint_hint_fill_set(Eo *eo_obj, Evas_Object_Protected_ evas_object_inform_call_changed_size_hints(eo_obj, obj); } -EAPI void +EVAS_API void evas_object_show(Evas_Object *eo_obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -1819,14 +1819,14 @@ evas_object_show(Evas_Object *eo_obj) efl_gfx_entity_visible_set(eo_obj, EINA_TRUE); } -EAPI void +EVAS_API void evas_object_hide(Evas_Object *eo_obj) { if (!eo_obj) return; efl_gfx_entity_visible_set(eo_obj, EINA_FALSE); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_visible_get(const Evas_Object *obj) { return efl_gfx_entity_visible_get((Evas_Object *)obj); @@ -2020,7 +2020,7 @@ _efl_canvas_object_efl_gfx_entity_visible_get(const Eo *eo_obj EINA_UNUSED, return obj->cur->visible; } -EAPI void +EVAS_API void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) { efl_gfx_color_set((Evas_Object *)obj, r, g, b, a); @@ -2067,7 +2067,7 @@ _efl_canvas_object_efl_gfx_color_color_set(Eo *eo_obj, Evas_Object_Protected_Dat evas_object_change(eo_obj, obj); } -EAPI void +EVAS_API void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) { efl_gfx_color_get((Evas_Object *)obj, r, g, b, a); @@ -2160,7 +2160,7 @@ _efl_canvas_object_render_op_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_D _render_op_set(obj, _gfx_to_evas_render_op(rop)); } -EAPI void +EVAS_API void evas_object_render_op_set(Evas_Object *eo_obj, Evas_Render_Op render_op) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj); @@ -2173,7 +2173,7 @@ _efl_canvas_object_render_op_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Prote return _evas_to_gfx_render_op(obj->cur->render_op); } -EAPI Evas_Render_Op +EVAS_API Evas_Render_Op evas_object_render_op_get(const Evas_Object *eo_obj) { return _gfx_to_evas_render_op(efl_canvas_object_render_op_get(eo_obj)); @@ -2533,7 +2533,7 @@ _efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) obj->legacy.ctor = EINA_TRUE; } -EAPI Eo * +EVAS_API Eo * evas_find(const Eo *obj) { if (efl_isa(obj, EVAS_CANVAS_CLASS)) @@ -2554,7 +2554,7 @@ _efl_canvas_object_event_animation_cancel(Eo *eo_obj) /* legacy */ -EAPI const char * +EVAS_API const char * evas_object_type_get(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, NULL); @@ -2562,7 +2562,7 @@ evas_object_type_get(const Evas_Object *eo_obj) return obj->type; } -EAPI void +EVAS_API void evas_object_static_clip_set(Evas_Object *eo_obj, Eina_Bool is_static_clip) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj); @@ -2570,20 +2570,20 @@ evas_object_static_clip_set(Evas_Object *eo_obj, Eina_Bool is_static_clip) obj->is_static_clip = is_static_clip; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_static_clip_get(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); return obj->is_static_clip; } -EAPI void +EVAS_API void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h) { efl_gfx_hint_aspect_set(obj, (Efl_Gfx_Hint_Aspect)aspect, EINA_SIZE2D(w, h)); } -EAPI void +EVAS_API void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz = { 0, 0 }; @@ -2592,13 +2592,13 @@ evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *as if (h) *h = sz.h; } -EAPI void +EVAS_API void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(w, h)); } -EAPI void +EVAS_API void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz; @@ -2607,13 +2607,13 @@ evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord if (h) *h = sz.h; } -EAPI void +EVAS_API void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(w, h)); } -EAPI void +EVAS_API void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { Eina_Size2D sz; @@ -2622,43 +2622,43 @@ evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord if (h) *h = sz.h; } -EAPI void +EVAS_API void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) { efl_gfx_hint_margin_set(obj, l, r, t, b); } -EAPI void +EVAS_API void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { efl_gfx_hint_margin_get(obj, l, r, t, b); } -EAPI void +EVAS_API void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y) { efl_gfx_hint_weight_set(obj, x, y); } -EAPI void +EVAS_API void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y) { efl_gfx_hint_weight_get(obj, x, y); } -EAPI void +EVAS_API void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y) { efl_gfx_hint_align_set(obj, x, y); } -EAPI void +EVAS_API void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y) { efl_gfx_hint_align_get(obj, x, y); } -EAPI Evas * +EVAS_API Evas * evas_object_evas_get(const Eo *eo_obj) { if (efl_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS)) @@ -2671,19 +2671,19 @@ evas_object_evas_get(const Eo *eo_obj) return efl_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS); } -EAPI void +EVAS_API void evas_object_scale_set(Evas_Object *obj, double scale) { efl_gfx_entity_scale_set(obj, scale); } -EAPI double +EVAS_API double evas_object_scale_get(const Evas_Object *obj) { return efl_gfx_entity_scale_get(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_pointer_inside_by_device_get(const Evas_Object *eo_obj, Efl_Input_Device *dev) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); @@ -2692,7 +2692,7 @@ evas_object_pointer_inside_by_device_get(const Evas_Object *eo_obj, Efl_Input_De return efl_canvas_pointer_inside_get(eo_obj, dev); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj, int x, int y) { Eina_Position2D pos = EINA_POSITION2D(x, y); @@ -2700,19 +2700,19 @@ evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj, int x, int y) return efl_canvas_object_coords_inside_get(eo_obj, pos); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_pointer_inside_get(const Evas_Object *eo_obj) { return evas_object_pointer_inside_by_device_get(eo_obj, NULL); } -EAPI void +EVAS_API void evas_object_is_frame_object_set(Efl_Canvas_Object *obj, Eina_Bool is_frame) { efl_canvas_object_is_frame_object_set(obj, is_frame); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_is_frame_object_get(const Efl_Canvas_Object *obj) { return efl_canvas_object_is_frame_object_get(obj); @@ -2721,10 +2721,10 @@ evas_object_is_frame_object_get(const Efl_Canvas_Object *obj) /* Internal EO APIs and hidden overrides */ -EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_is_frame_object_set, EFL_FUNC_CALL(is_frame), Eina_Bool is_frame); -EOAPI EFL_FUNC_BODY_CONST(efl_canvas_object_is_frame_object_get, Eina_Bool, 0); -EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor) -EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_type_set, EFL_FUNC_CALL(type), const char *type) +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_canvas_object_is_frame_object_set, EFL_FUNC_CALL(is_frame), Eina_Bool is_frame); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(efl_canvas_object_is_frame_object_get, Eina_Bool, 0); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor) +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_canvas_object_type_set, EFL_FUNC_CALL(type), const char *type) #define EFL_CANVAS_OBJECT_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \ diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index f37b9f5b25..55addf00f2 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -74,7 +74,7 @@ static const Evas_Object_Func object_func = /* the actual api call to add a rect */ /* it has no other api calls as all properties are standard */ -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_polygon_add(Evas *e) { e = evas_find(e); @@ -507,13 +507,13 @@ evas_object_polygon_was_inside(Evas_Object *eo_obj EINA_UNUSED, return 1; } -EAPI void +EVAS_API void evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { efl_canvas_polygon_point_add(obj, EINA_POSITION2D(x, y)); } -EAPI void +EVAS_API void evas_object_polygon_points_clear(Evas_Object *obj) { efl_canvas_polygon_points_clear(obj); diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index 222effe942..8e27f61e90 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -74,7 +74,7 @@ static const Evas_Object_Func object_func = /* the actual api call to add a rect */ /* it has no other api calls as all properties are standard */ -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_rectangle_add(Evas *e) { e = evas_find(e); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index cc0ab2c09d..012a7f4374 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -132,7 +132,7 @@ _smart_clipper_get(Evas_Smart_Data *o) } /* public funcs */ -EAPI void +EVAS_API void evas_object_smart_data_set(Evas_Object *eo_obj, void *data) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); @@ -145,14 +145,14 @@ evas_object_smart_data_set(Evas_Object *eo_obj, void *data) } } -EAPI void * +EVAS_API void * evas_object_smart_data_get(const Evas_Object *eo_obj) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, NULL); return o->data; } -EAPI const void * +EVAS_API const void * evas_object_smart_interface_get(const Evas_Object *eo_obj, const char *name) { @@ -176,7 +176,7 @@ evas_object_smart_interface_get(const Evas_Object *eo_obj, return NULL; } -EAPI void * +EVAS_API void * evas_object_smart_interface_data_get(const Evas_Object *eo_obj, const Evas_Smart_Interface *iface) { @@ -199,14 +199,14 @@ evas_object_smart_interface_data_get(const Evas_Object *eo_obj, return NULL; } -EAPI Evas_Smart* +EVAS_API Evas_Smart* evas_object_smart_smart_get(const Efl_Canvas_Group *eo_obj) { Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, NULL); return obj->smart.smart; } -EAPI void +EVAS_API void evas_object_smart_member_add(Evas_Object *eo_obj, Evas_Object *smart_obj) { efl_canvas_group_member_add(smart_obj, eo_obj); @@ -340,7 +340,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec efl_event_callback_call(smart_obj, EFL_CANVAS_GROUP_EVENT_MEMBER_ADDED, eo_obj); } -EAPI void +EVAS_API void evas_object_smart_member_del(Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj; @@ -426,7 +426,7 @@ _efl_canvas_group_group_member_remove(Eo *smart_obj, Evas_Smart_Data *sd, Evas_O evas_object_mapped_clip_across_mark(eo_obj, obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type) { const Evas_Smart_Class *sc; @@ -455,7 +455,7 @@ evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type) return type_check; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type) { Efl_Class *klass; @@ -484,7 +484,7 @@ evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type) return type_check; } -EAPI void +EVAS_API void evas_smart_legacy_type_register(const char *type, const Efl_Class *klass) { eina_hash_set(_evas_smart_class_names_hash_table, type, klass); @@ -555,7 +555,7 @@ _efl_canvas_group_group_member_is(const Eo *eo_obj, Evas_Smart_Data *pd EINA_UNU return (sub->smart.parent == eo_obj); } -EAPI Eina_List* +EVAS_API Eina_List* evas_object_smart_members_get(const Evas_Object *eo_obj) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, NULL); @@ -698,7 +698,7 @@ _evas_smart_class_ifaces_private_data_alloc(Evas_Object *eo_obj, } } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_smart_add(Evas *eo_e, Evas_Smart *s) { Evas_Object *eo_obj; @@ -786,7 +786,7 @@ _evas_object_smart_move_relative_internal(Evas_Smart_Data *o, Evas_Coord dx, Eva } } -EAPI void +EVAS_API void evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Coord dx, Evas_Coord dy) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); @@ -1036,7 +1036,7 @@ evas_object_smart_attach(Evas_Object *eo_obj, Evas_Smart *s) if (s->smart_class->add) s->smart_class->add(eo_obj); } -EAPI void +EVAS_API void evas_object_smart_callback_add(Evas_Object *eo_obj, const char *event, Evas_Smart_Cb func, const void *data) { evas_object_smart_callback_priority_add(eo_obj, event, @@ -1072,7 +1072,7 @@ _smart_cb_check(Evas_Smart_Data *o, const char *event) } } -EAPI void +EVAS_API void evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); @@ -1093,7 +1093,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event, efl_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info); } -EAPI void * +EVAS_API void * evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smart_Cb func) { _eo_evas_smart_cb_info *info; @@ -1120,7 +1120,7 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar return NULL; } -EAPI void * +EVAS_API void * evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas_Smart_Cb func, const void *data) { _eo_evas_smart_cb_info *info; @@ -1147,7 +1147,7 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas return NULL; } -EAPI void +EVAS_API void evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *event_info) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); @@ -1186,7 +1186,7 @@ _evas_object_smart_callback_call_internal(Evas_Object *eo_obj, const Efl_Event_D efl_event_callback_legacy_call(eo_obj, eo_desc, NULL); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_smart_callbacks_descriptions_set(Eo *eo_obj, const Evas_Smart_Cb_Description *descriptions) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj, EINA_FALSE); @@ -1213,7 +1213,7 @@ evas_object_smart_callbacks_descriptions_set(Eo *eo_obj, const Evas_Smart_Cb_Des return EINA_TRUE; } -EAPI void +EVAS_API void evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); @@ -1232,7 +1232,7 @@ evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, const Evas_Smart_ *instance_count = o->callbacks_descriptions.size; } -EAPI void +EVAS_API void evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description) { EVAS_OBJECT_SMART_GET_OR_RETURN(eo_obj); @@ -2011,9 +2011,9 @@ _efl_canvas_group_efl_object_event_callback_array_priority_add(Eo *obj, Evas_Sma } return efl_event_callback_array_priority_add(efl_super(obj, MY_CLASS), array, priority, user_data); } -EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_add) -EOAPI EFL_VOID_FUNC_BODY(efl_canvas_group_del) -EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_group_clipped_set, EFL_FUNC_CALL(enable), Eina_Bool enable) +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(efl_canvas_group_add) +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODY(efl_canvas_group_del) +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(efl_canvas_group_clipped_set, EFL_FUNC_CALL(enable), Eina_Bool enable) #define EFL_CANVAS_GROUP_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_canvas_group_add, _efl_canvas_group_group_add), \ diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index a904479c01..41633c8df3 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -10,7 +10,7 @@ CSO_DATA_GET(eo_obj, ptr) \ if (!ptr) return __VA_ARGS__; -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_smart_clipped_clipper_get(const Evas_Object *eo_obj) { CSO_DATA_GET_OR_RETURN(eo_obj, cso, NULL); @@ -98,7 +98,7 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem evas_object_hide(cso->clipper); } -EAPI void +EVAS_API void evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) { if (!sc) @@ -117,7 +117,7 @@ evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) sc->member_del = evas_object_smart_clipped_smart_member_del; } -EAPI const Evas_Smart_Class * +EVAS_API const Evas_Smart_Class * evas_object_smart_clipped_class_get(void) { static Evas_Smart_Class _sc = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartClipped"); diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 95580b8588..d9be88351d 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -965,7 +965,7 @@ _evas_table_efl_canvas_group_group_calculate(Eo *o, Evas_Table_Data *priv) evas_event_thaw_eval(e); } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_table_add(Evas *evas) { evas = evas_find(evas); @@ -1411,7 +1411,7 @@ _evas_table_efl_ui_i18n_mirrored_get(const Eo *o EINA_UNUSED, Evas_Table_Data *p return priv->is_mirrored; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_table_mirrored_get(const Eo *obj) { return efl_ui_mirrored_get(obj); @@ -1427,7 +1427,7 @@ _evas_table_efl_ui_i18n_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mir } } -EAPI void +EVAS_API void evas_object_table_mirrored_set(Eo *obj, Eina_Bool mirrored) { efl_ui_mirrored_set(obj, mirrored); diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index b054302a6d..66fa5020d4 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -362,7 +362,7 @@ _evas_object_text_vert_advance_get(const Evas_Object *obj EINA_UNUSED, return o->max_ascent + o->max_descent; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_text_add(Evas *e) { e = evas_find(e); @@ -1457,7 +1457,7 @@ _evas_text_style_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, in _evas_object_text_pad_get(eo_obj, o, l, r, t, b); } -EAPI int +EVAS_API int evas_string_char_next_get(const char *str, int pos, int *decoded) { int p, d; @@ -1473,7 +1473,7 @@ evas_string_char_next_get(const char *str, int pos, int *decoded) return p; } -EAPI int +EVAS_API int evas_string_char_prev_get(const char *str, int pos, int *decoded) { int p, d; @@ -1486,7 +1486,7 @@ evas_string_char_prev_get(const char *str, int pos, int *decoded) return p; } -EAPI int +EVAS_API int evas_string_char_len_get(const char *str) { if (!str) return 0; @@ -2322,13 +2322,13 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) #endif } -EAPI void +EVAS_API void evas_object_text_font_source_set(Eo *obj, const char *font_source) { efl_text_font_source_set((Eo *) obj, font_source); } -EAPI const char * +EVAS_API const char * evas_object_text_font_source_get(const Eo *obj) { const char *font_source = 0; @@ -2336,7 +2336,7 @@ evas_object_text_font_source_get(const Eo *obj) return font_source; } -EAPI void +EVAS_API void evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size) { if (!font || size <= 0) return; /*Condition for legacy object*/ @@ -2345,20 +2345,20 @@ evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size) efl_text_font_size_set((Eo *) obj, size); } -EAPI void +EVAS_API void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size) { if (font) *font = efl_text_font_family_get((Eo *) obj); if (size) *size = efl_text_font_size_get((Eo *) obj); } -EAPI void +EVAS_API void evas_object_text_text_set(Eo *obj, const char *text) { efl_text_set((Eo *) obj, text); } -EAPI const char * +EVAS_API const char * evas_object_text_text_get(const Eo *obj) { return efl_text_get((Eo *) obj); @@ -2372,14 +2372,14 @@ _evas_text_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UN } /* deprecated */ -EAPI void +EVAS_API void evas_object_text_filter_program_set(Evas_Object *obj, const char *code) { efl_gfx_filter_program_set(obj, code, NULL); } /* deprecated */ -EAPI void +EVAS_API void evas_object_text_filter_source_set(Evas_Object *obj, const char *name, Evas_Object *source) { efl_gfx_filter_source_set(obj, name, source); diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index fcf16b7f95..b206d09bb1 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -633,7 +633,7 @@ static const char *_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Da #endif static Eina_Bool _evas_textblock_cursor_format_append(Efl_Text_Cursor_Handle *cur, const char *format, Evas_Object_Textblock_Node_Format **_fnode, Eina_Bool is_item); -EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur); +EVAS_API Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur); static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Handle *cur); static void _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Text *n, size_t pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr); static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_at_pos_get(const Efl_Text_Cursor_Handle *cur); @@ -7898,7 +7898,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line) return NULL; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_textblock_add(Evas *e) { Efl_Canvas_Textblock_Data *o; @@ -7962,7 +7962,7 @@ _efl_canvas_textblock_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Textblock_Da return eo_obj; } -EAPI Evas_Textblock_Style * +EVAS_API Evas_Textblock_Style * evas_textblock_style_new(void) { Evas_Textblock_Style *ts; @@ -7972,7 +7972,7 @@ evas_textblock_style_new(void) return ts; } -EAPI void +EVAS_API void evas_textblock_style_free(Evas_Textblock_Style *ts) { if (!ts) return; @@ -8039,7 +8039,7 @@ _evas_textblock_update_format_nodes_from_style_tag(Evas_Object *eo_obj, Efl_Canv } } -EAPI void +EVAS_API void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) { Eina_List *l; @@ -8167,7 +8167,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) } } -EAPI const char * +EVAS_API const char * evas_textblock_style_get(const Evas_Textblock_Style *ts) { if (!ts) return NULL; @@ -8295,7 +8295,7 @@ _textblock_style_generic_set(Evas_Object *eo_obj, Evas_Textblock_Style *ts, _evas_textblock_changed(o, eo_obj); } -EAPI void +EVAS_API void evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8331,7 +8331,7 @@ _efl_canvas_textblock_style_apply(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, cons _format_fill(eo_obj, &(o->default_format.format), style, EINA_TRUE); } -EAPI Evas_Textblock_Style * +EVAS_API Evas_Textblock_Style * evas_object_textblock_style_get(const Eo *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -8360,7 +8360,7 @@ _efl_canvas_textblock_cursor_create(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_ } #define _STYLE_USER "_style_user" -EAPI void +EVAS_API void evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8370,7 +8370,7 @@ evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts) _textblock_style_generic_set(eo_obj, ts, _STYLE_USER); } -EAPI const Evas_Textblock_Style* +EVAS_API const Evas_Textblock_Style* evas_object_textblock_style_user_peek(const Eo *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -8382,7 +8382,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj) return ts; } -EAPI void +EVAS_API void evas_object_textblock_style_user_pop(Eo *eo_obj) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8391,7 +8391,7 @@ evas_object_textblock_style_user_pop(Eo *eo_obj) _textblock_style_generic_set(eo_obj, NULL, _STYLE_USER); } -EAPI void +EVAS_API void evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char *ch) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8431,7 +8431,7 @@ _efl_canvas_textblock_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0); } -EAPI void +EVAS_API void evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8445,7 +8445,7 @@ evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align) _evas_textblock_changed(o, eo_obj); } -EAPI double +EVAS_API double evas_object_textblock_valign_get(const Efl_Canvas_Textblock *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); @@ -8467,7 +8467,7 @@ _efl_canvas_textblock_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canv return o->bidi_delimiters; } -EAPI const char * +EVAS_API const char * evas_object_textblock_replace_char_get(const Efl_Canvas_Textblock *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); @@ -8648,7 +8648,7 @@ _escaped_char_get(const char *s, const char *s_end) return NULL; } -EAPI const char * +EVAS_API const char * evas_textblock_escape_string_get(const char *escape) { /* & -> & */ @@ -8656,14 +8656,14 @@ evas_textblock_escape_string_get(const char *escape) return _escaped_char_get(escape, escape + strlen(escape)); } -EAPI const char * +EVAS_API const char * evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end) { if ((!escape_start) || (!escape_end)) return NULL; return _escaped_char_get(escape_start, escape_end); } -EAPI const char * +EVAS_API const char * evas_textblock_string_escape_get(const char *string, int *len_ret) { if ((!string) || (!len_ret)) return NULL; @@ -8783,7 +8783,7 @@ _evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, o->markup_text = text; } -EAPI void +EVAS_API void evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -8947,7 +8947,7 @@ _evas_object_textblock_text_markup_prepend(Eo *eo_obj, _evas_textblock_changed(o, eo_obj); } -EAPI void +EVAS_API void evas_object_textblock_text_markup_prepend(Efl_Text_Cursor_Handle *cur, const char *text) { EINA_SAFETY_ON_NULL_RETURN(cur); @@ -9104,7 +9104,7 @@ _evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Da return markup; } -EAPI const char* +EVAS_API const char* evas_object_textblock_text_markup_get(Eo *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -9118,7 +9118,7 @@ _efl_canvas_textblock_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Te return _evas_object_textblock_text_markup_get(eo_obj, o); } -EAPI char * +EVAS_API char * evas_textblock_text_markup_to_utf8(const Evas_Object *eo_obj, const char *text) { /* FIXME: Redundant and awful, should be merged with markup_prepend */ @@ -9277,7 +9277,7 @@ evas_textblock_text_markup_to_utf8(const Evas_Object *eo_obj, const char *text) return ret; } -EAPI char * +EVAS_API char * evas_textblock_text_utf8_to_markup(const Evas_Object *eo_obj EINA_UNUSED, const char *text) { @@ -9786,7 +9786,7 @@ _evas_textblock_cursor_init(Efl_Text_Cursor_Handle *cur, const Evas_Object *tb) cur->pos = 0; } -EAPI Efl_Text_Cursor_Handle * +EVAS_API Efl_Text_Cursor_Handle * evas_object_textblock_cursor_new(const Evas_Object *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -9806,7 +9806,7 @@ evas_object_textblock_cursor_new(const Evas_Object *eo_obj) return cur; } -EAPI void +EVAS_API void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) { if (!cur) return; @@ -9852,7 +9852,7 @@ evas_textblock_cursor_unref(Efl_Text_Cursor_Handle *cursor, Eo * cur_obj) } } -EAPI Eina_Bool +EVAS_API Eina_Bool _evas_textblock_cursor_is_format(const Efl_Text_Cursor_Handle *cur) { if ((!cur) || (!cur->node)) return EINA_FALSE; @@ -9862,13 +9862,13 @@ _evas_textblock_cursor_is_format(const Efl_Text_Cursor_Handle *cur) EINA_TRUE : EINA_FALSE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur) { return _evas_textblock_cursor_is_format(cur); } -EAPI const Eina_List * +EVAS_API const Eina_List * evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -9882,7 +9882,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor) return NULL; } -EAPI const Evas_Object_Textblock_Node_Format* +EVAS_API const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_first_get(Evas_Object *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -9892,7 +9892,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj) return o->format_nodes; } -EAPI const Evas_Object_Textblock_Node_Format* +EVAS_API const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_last_get(Evas_Object *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); @@ -9902,21 +9902,21 @@ evas_textblock_node_format_last_get(Evas_Object *eo_obj) return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL; } -EAPI const Evas_Object_Textblock_Node_Format * +EVAS_API const Evas_Object_Textblock_Node_Format * evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n) { if (!n) return NULL; return _NODE_FORMAT(EINA_INLIST_GET(n)->next); } -EAPI const Evas_Object_Textblock_Node_Format * +EVAS_API const Evas_Object_Textblock_Node_Format * evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n) { if (!n) return NULL; return _NODE_FORMAT(EINA_INLIST_GET(n)->prev); } -EAPI void +EVAS_API void evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Format *n) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); @@ -10026,7 +10026,7 @@ found: _evas_textblock_changed(o, eo_obj); } -EAPI void +EVAS_API void evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Handle *cur) { if (!cur) return; @@ -10038,7 +10038,7 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Handle *cur) _evas_textblock_cursor_object_changed(cur); } -EAPI void +EVAS_API void evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Handle *cur) { Evas_Object_Textblock_Node_Text *node; @@ -10087,7 +10087,7 @@ _evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Handle *cur) return EINA_FALSE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = EINA_FALSE; @@ -10126,7 +10126,7 @@ _evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Handle *cur) } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = EINA_FALSE; @@ -10136,13 +10136,13 @@ evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Handle *cur) return b_ret; } -EAPI void +EVAS_API void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) { evas_textblock_cursor_at_format_set(cur, n); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur) { Evas_Object_Textblock_Node_Format *node; @@ -10181,7 +10181,7 @@ evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur) return EINA_FALSE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur) { const Evas_Object_Textblock_Node_Format *node; @@ -10223,7 +10223,7 @@ evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur) #define BREAK_AFTER(i) \ (breaks[i] == WORDBREAK_BREAK) -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_word_start(Efl_Text_Cursor_Handle *cur) { if (!cur) return EINA_FALSE; @@ -10289,7 +10289,7 @@ evas_textblock_cursor_word_start(Efl_Text_Cursor_Handle *cur) return EINA_FALSE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_word_end(Efl_Text_Cursor_Handle *cur) { if (!cur) return EINA_FALSE; @@ -10507,7 +10507,7 @@ _evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc return ret; } -EAPI Eina_Bool evas_textblock_cursor_at_cluster_as_single_glyph(Evas_Textblock_Cursor *cur,Eina_Bool forward) +EVAS_API Eina_Bool evas_textblock_cursor_at_cluster_as_single_glyph(Evas_Textblock_Cursor *cur,Eina_Bool forward) { Eina_Bool is_single_glyph = EINA_FALSE; size_t ret = _evas_textblock_cursor_cluster_pos_get(cur, forward, &is_single_glyph); @@ -10600,7 +10600,7 @@ _evas_textblock_cursor_prev(Evas_Textblock_Cursor *cur, Eina_Bool per_cluster) return evas_textblock_cursor_paragraph_prev(cur); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_char_next(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = _evas_textblock_cursor_next(cur, EINA_FALSE); @@ -10608,7 +10608,7 @@ evas_textblock_cursor_char_next(Efl_Text_Cursor_Handle *cur) return b_ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_char_prev(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = _evas_textblock_cursor_prev(cur, EINA_FALSE); @@ -10616,7 +10616,7 @@ evas_textblock_cursor_char_prev(Efl_Text_Cursor_Handle *cur) return b_ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_cluster_next(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = _evas_textblock_cursor_next(cur, EINA_TRUE); @@ -10624,7 +10624,7 @@ evas_textblock_cursor_cluster_next(Efl_Text_Cursor_Handle *cur) return b_ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_cluster_prev(Efl_Text_Cursor_Handle *cur) { Eina_Bool b_ret = _evas_textblock_cursor_prev(cur, EINA_TRUE); @@ -10632,7 +10632,7 @@ evas_textblock_cursor_cluster_prev(Efl_Text_Cursor_Handle *cur) return b_ret; } -EAPI void +EVAS_API void evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Handle *cur) { if (!cur) return; @@ -10642,7 +10642,7 @@ evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Handle *cur) _evas_textblock_cursor_object_changed(cur); } -EAPI void +EVAS_API void evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Handle *cur) { int ind; @@ -10692,7 +10692,7 @@ _cursor_line_first_char_get(Evas_Object_Textblock_Line *ln, } } -EAPI void +EVAS_API void evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Handle *cur) { Evas_Object_Textblock_Line *ln = NULL; @@ -10717,7 +10717,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Handle *cur) _evas_textblock_cursor_object_changed(cur); } -EAPI void +EVAS_API void evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Handle *cur) { Evas_Object_Textblock_Line *ln = NULL; @@ -11215,7 +11215,7 @@ _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt return position + fmt->offset; } -EAPI int +EVAS_API int evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Handle *cur) { if (!cur) return -1; @@ -11235,7 +11235,7 @@ evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Handle *cur) return npos + cur->pos; } -EAPI void +EVAS_API void evas_textblock_cursor_pos_set(Efl_Text_Cursor_Handle *cur, int _pos) { Evas_Object_Textblock_Node_Text *n; @@ -11283,7 +11283,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Handle *cur, int _pos) _evas_textblock_cursor_object_changed(cur); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) { Evas_Object_Textblock_Line *ln; @@ -11304,7 +11304,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) return EINA_TRUE; } -EAPI void +EVAS_API void evas_textblock_cursor_line_jump_by(Efl_Text_Cursor_Handle *cur, int by) { if (!cur) return; @@ -11366,7 +11366,7 @@ evas_textblock_cursor_line_jump_by(Efl_Text_Cursor_Handle *cur, int by) } } -EAPI int +EVAS_API int evas_textblock_cursor_compare(const Efl_Text_Cursor_Handle *cur1, const Efl_Text_Cursor_Handle *cur2) { @@ -11395,14 +11395,14 @@ evas_textblock_cursor_compare(const Efl_Text_Cursor_Handle *cur1, return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) { return ((cur1->node == cur2->node) && (cur1->pos == cur2->pos)); } -EAPI void +EVAS_API void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur_src, Efl_Text_Cursor_Handle *cur_dest) { if (!cur_src || !cur_dest) return; @@ -11789,7 +11789,7 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Handle *cur, const char *_tex return len; } -EAPI int +EVAS_API int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *_text) { return _evas_textblock_cursor_text_append(cur, _text); @@ -11809,7 +11809,7 @@ _evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Handle *cur, const char *_te return len; } -EAPI int +EVAS_API int evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Handle *cur, const char *_text) { return _evas_textblock_cursor_text_prepend(cur, _text); @@ -12128,7 +12128,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Handle *cur, return is_visible; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format) { return _evas_textblock_cursor_format_append(cur, format, NULL, EINA_FALSE); @@ -12153,13 +12153,13 @@ _evas_textblock_cursor_format_prepend(Efl_Text_Cursor_Handle *cur, const char *f return is_visible; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format) { return _evas_textblock_cursor_format_prepend(cur, format); } -EAPI void +EVAS_API void evas_textblock_cursor_char_delete(Efl_Text_Cursor_Handle *cur) { Evas_Object_Textblock_Node_Text *n, *n2; @@ -12238,7 +12238,7 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Handle *cur) _evas_textblock_cursor_object_changed(cur); } -EAPI void +EVAS_API void evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor_Handle *cur2) { if (!cur1) return; @@ -12345,7 +12345,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor efl_event_callback_call(cur1->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } -EAPI char * +EVAS_API char * evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) { if (!cur || !cur->node) return NULL; @@ -12543,7 +12543,7 @@ _evas_textblock_cursor_range_text_plain_get(const Efl_Text_Cursor_Handle *cur1, } } -EAPI Eina_List * +EVAS_API Eina_List * evas_textblock_cursor_range_formats_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2) { Evas_Object *eo_obj; @@ -12635,13 +12635,13 @@ _evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Handle *cur1, const } // Add to legacy api -EAPI char * +EVAS_API char * evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format) { return _evas_textblock_cursor_range_text_get(cur1, cur2, format); } -EAPI const char * +EVAS_API const char * evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur) { Efl_Text_Cursor_Handle cur1, cur2; @@ -12664,7 +12664,7 @@ evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur) return cur->node->utf8; } -EAPI int +EVAS_API int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur) { int len; @@ -12680,7 +12680,7 @@ evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur return len; } -EAPI const Evas_Object_Textblock_Node_Format * +EVAS_API const Evas_Object_Textblock_Node_Format * evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur) { if (!cur) return NULL; @@ -12690,7 +12690,7 @@ evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur) return _evas_textblock_cursor_node_format_at_pos_get(cur); } -EAPI const char * +EVAS_API const char * evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fmt) { static char *ret = NULL; @@ -12741,7 +12741,7 @@ _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Handle *cur, cur->pos = _evas_textblock_node_format_pos_get(fmt); } -EAPI void +EVAS_API void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt) { _evas_textblock_cursor_at_format_set(cur, fmt); @@ -12761,7 +12761,7 @@ _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Handle *cur) return EVAS_TEXTBLOCK_IS_VISIBLE_FORMAT_CHAR(text[cur->pos]); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur) { return _evas_textblock_cursor_format_is_visible_get(cur); @@ -12787,7 +12787,7 @@ _find_layout_line_by_item(Evas_Object_Textblock_Paragraph *par, Evas_Object_Text } #endif -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype) { if (!cur) return EINA_FALSE; @@ -12972,7 +12972,7 @@ evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Handle *cur, Evas_ return EINA_FALSE; } -EAPI int +EVAS_API int evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype) { int ret = -1; @@ -13162,7 +13162,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat return ln->par->line_no + ln->line_no; } -EAPI int +EVAS_API int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { if (!cur) return -1; @@ -13172,7 +13172,7 @@ evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C ENFN->font_char_coords_get, cur, cx, cy, cw, ch); } -EAPI int +EVAS_API int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { if (!cur) return -1; @@ -13182,7 +13182,7 @@ evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Co ENFN->font_pen_coords_get, cur, cx, cy, cw, ch); } -EAPI int +EVAS_API int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { Evas_Object_Textblock_Line *ln = NULL; @@ -13216,7 +13216,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C return ln->par->line_no + ln->line_no; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Handle *start, Evas_Textblock_Cursor *end) { Eo * eo_obj = start->obj; @@ -13446,19 +13446,19 @@ end: return ret; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y) { return _evas_textblock_cursor_coord_set(cur, x, y, EINA_FALSE); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y) { return _evas_textblock_cursor_coord_set(cur, x, y, EINA_TRUE); } -EAPI int +EVAS_API int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) { Evas_Object_Textblock_Paragraph *found_par; @@ -13882,7 +13882,7 @@ _line_fill_rect_get(const Evas_Object_Textblock_Line *ln, return tr; } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2) { if (!cur1) return NULL; @@ -14065,7 +14065,7 @@ _efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, return rects; } -EAPI Eina_List * +EVAS_API Eina_List * evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2_obj) { Efl_Canvas_Textblock_Data *o; @@ -14108,13 +14108,13 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Handle *cu return EINA_TRUE; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { return _evas_textblock_cursor_format_item_geometry_get(cur, cx, cy, cw, ch); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur) { Eina_Bool ret = EINA_FALSE; @@ -14134,7 +14134,7 @@ evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur) } /* general controls */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, EINA_FALSE); @@ -14185,7 +14185,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj) _evas_textblock_changed(o, eo_obj); } -EAPI void +EVAS_API void evas_object_textblock_clear(Evas_Object *eo_obj) { TB_HEAD(); @@ -17428,7 +17428,7 @@ _efl_canvas_textblock_efl_text_format_replacement_char_get(const Eo *obj EINA_UN #ifdef HAVE_TESTS /* return EINA_FALSE on error, used in unit_testing */ -EAPI Eina_Bool +EVAS_API Eina_Bool _evas_textblock_check_item_node_link(Evas_Object *eo_obj) { Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); @@ -17454,7 +17454,7 @@ _evas_textblock_check_item_node_link(Evas_Object *eo_obj) return EINA_TRUE; } -EAPI int +EVAS_API int _evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n) { return n->offset; @@ -17463,7 +17463,7 @@ _evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n) #if 0 /* Good for debugging */ -EAPI void +EVAS_API void pfnode(Evas_Object_Textblock_Node_Format *n) { printf("Format Node: %p\n", n); @@ -17472,7 +17472,7 @@ pfnode(Evas_Object_Textblock_Node_Format *n) printf("'%s'\n", n->format); } -EAPI void +EVAS_API void ptnode(Evas_Object_Textblock_Node_Text *n) { printf("Text Node: %p\n", n); @@ -17481,7 +17481,7 @@ ptnode(Evas_Object_Textblock_Node_Text *n) printf("'%ls'\n", eina_ustrbuf_string_get(n->unicode)); } -EAPI void +EVAS_API void pitem(Evas_Object_Textblock_Item *it) { Evas_Object_Textblock_Text_Item *ti; @@ -17514,7 +17514,7 @@ pitem(Evas_Object_Textblock_Item *it) } } -EAPI void +EVAS_API void ppar(Evas_Object_Textblock_Paragraph *par) { Evas_Object_Textblock_Item *it; @@ -17531,7 +17531,7 @@ ppar(Evas_Object_Textblock_Paragraph *par) #define EFL_CANVAS_TEXTBLOCK_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_textblock_efl_object_dbg_info_get) -EAPI Efl_Text_Cursor_Handle * +EVAS_API Efl_Text_Cursor_Handle * evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED) { TB_HEAD_RETURN(NULL); @@ -17867,7 +17867,7 @@ int fit_fill_internal_list(TEXT_FIT_CONTENT_CONFIG *fc) -EAPI int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options) +EVAS_API int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17881,7 +17881,7 @@ EAPI int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options) return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int *p_options) +EVAS_API int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int *p_options) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17891,7 +17891,7 @@ EAPI int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int *p return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_font_size, unsigned int max_font_size) +EVAS_API int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_font_size, unsigned int max_font_size) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17940,7 +17940,7 @@ EAPI int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_f return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int *p_min_font_size, unsigned int *p_max_font_size) +EVAS_API int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int *p_min_font_size, unsigned int *p_max_font_size) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17955,7 +17955,7 @@ EAPI int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_size) +EVAS_API int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_size) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17977,7 +17977,7 @@ EAPI int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_s return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_step_size_get(const Evas_Object *obj, unsigned int * p_step_size) +EVAS_API int evas_textblock_fit_step_size_get(const Evas_Object *obj, unsigned int * p_step_size) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); @@ -17997,7 +17997,7 @@ int compareUINT(const void * a, const void * b) else return 0; } -EAPI int evas_textblock_fit_size_array_set(Evas_Object *obj, const unsigned int *p_size_array, size_t size_array_len) +EVAS_API int evas_textblock_fit_size_array_set(Evas_Object *obj, const unsigned int *p_size_array, size_t size_array_len) { int n_ret = EVAS_ERROR_SUCCESS; EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); @@ -18029,7 +18029,7 @@ EAPI int evas_textblock_fit_size_array_set(Evas_Object *obj, const unsigned int return EVAS_ERROR_SUCCESS; } -EAPI int evas_textblock_fit_size_array_get(const Evas_Object *obj, unsigned int *p_size_array, size_t *p_size_array_len, size_t passed_array_size) +EVAS_API int evas_textblock_fit_size_array_get(const Evas_Object *obj, unsigned int *p_size_array, size_t *p_size_array_len, size_t passed_array_size) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EVAS_ERROR_INVALID_PARAM); Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 1626349ea2..2d9b143452 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -868,7 +868,7 @@ _evas_textgrid_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data /********************* API *********************/ -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_textgrid_add(Evas *e) { e = evas_find(e); @@ -1474,13 +1474,13 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UN } } -EAPI void +EVAS_API void evas_object_textgrid_font_source_set(Eo *obj, const char *font_source) { efl_text_font_source_set((Eo *) obj, font_source); } -EAPI const char * +EVAS_API const char * evas_object_textgrid_font_source_get(const Eo *obj) { const char *font_source = NULL; @@ -1488,14 +1488,14 @@ evas_object_textgrid_font_source_get(const Eo *obj) return font_source; } -EAPI void +EVAS_API void evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size) { efl_text_font_family_set((Eo *) obj, font_name); efl_text_font_size_set((Eo *) obj, font_size); } -EAPI void +EVAS_API void evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size) { if (font_name) *font_name = efl_text_font_family_get((Eo *) obj); diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c index 43bad0dd42..49fd7f7ea5 100644 --- a/src/lib/evas/canvas/evas_out.c +++ b/src/lib/evas/canvas/evas_out.c @@ -35,7 +35,7 @@ efl_canvas_output_info_get(Evas_Public_Data *e, Efl_Canvas_Output *output) e->engine.func->output_info_setup(output->info); } -EAPI Efl_Canvas_Output * +EVAS_API Efl_Canvas_Output * efl_canvas_output_add(Evas *canvas) { Efl_Canvas_Output *r; @@ -67,7 +67,7 @@ efl_canvas_output_add(Evas *canvas) return r; } -EAPI void +EVAS_API void efl_canvas_output_del(Efl_Canvas_Output *output) { if (output->canvas) @@ -93,7 +93,7 @@ efl_canvas_output_del(Efl_Canvas_Output *output) free(output); } -EAPI void +EVAS_API void efl_canvas_output_view_set(Efl_Canvas_Output *output, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { @@ -117,7 +117,7 @@ efl_canvas_output_view_set(Efl_Canvas_Output *output, // XXX: tell evas to add damage if viewport loc/size changed } -EAPI void +EVAS_API void efl_canvas_output_view_get(Efl_Canvas_Output *output, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { @@ -127,7 +127,7 @@ efl_canvas_output_view_get(Efl_Canvas_Output *output, if (h) *h = output->geometry.h; } -EAPI Eina_Bool +EVAS_API Eina_Bool efl_canvas_output_engine_info_set(Efl_Canvas_Output *output, Evas_Engine_Info *info) { @@ -165,7 +165,7 @@ efl_canvas_output_engine_info_set(Efl_Canvas_Output *output, return !!output->output; } -EAPI Evas_Engine_Info* +EVAS_API Evas_Engine_Info* efl_canvas_output_engine_info_get(Efl_Canvas_Output *output) { Evas_Engine_Info *info = output->info; @@ -176,14 +176,14 @@ efl_canvas_output_engine_info_get(Efl_Canvas_Output *output) return output->info; } -EAPI Eina_Bool +EVAS_API Eina_Bool efl_canvas_output_lock(Efl_Canvas_Output *output) { output->lock++; return EINA_TRUE; } -EAPI Eina_Bool +EVAS_API Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output) { return !!(--output->lock); diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index c356995b55..f013f23aa6 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -2961,7 +2961,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas) eina_evlog("-render_pre_objects_finalize", eo_e, 0.0, NULL); } -EAPI void +EVAS_API void evas_render_pending_objects_flush(Evas *eo_e) { Evas_Public_Data *evas = efl_data_scope_safe_get(eo_e, EVAS_CANVAS_CLASS); @@ -4061,7 +4061,7 @@ evas_render_pipe_wakeup(void *data) eina_evlog("-render_pipe_wakeup", e, 0.0, NULL); } -EAPI void +EVAS_API void evas_render_updates_free(Eina_List *updates) { Eina_Rectangle *r; @@ -4153,7 +4153,7 @@ _evas_canvas_norender(Eo *eo_e, Evas_Public_Data *e) evas_render_updates_internal_wait(eo_e, 0, 0); } -EAPI void +EVAS_API void evas_norender_with_updates(Eo *eo_e) { Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); diff --git a/src/lib/evas/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c index b33ccaef23..470fd8f6a4 100644 --- a/src/lib/evas/canvas/evas_smart.c +++ b/src/lib/evas/canvas/evas_smart.c @@ -7,7 +7,7 @@ static void _evas_smart_class_interfaces_create(Evas_Smart *s); /* all public */ -EAPI void +EVAS_API void evas_smart_free(Evas_Smart *s) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); @@ -22,7 +22,7 @@ evas_smart_free(Evas_Smart *s) free(s); } -EAPI Evas_Smart * +EVAS_API Evas_Smart * evas_smart_class_new(const Evas_Smart_Class *sc) { Evas_Smart *s; @@ -44,7 +44,7 @@ evas_smart_class_new(const Evas_Smart_Class *sc) return s; } -EAPI const Evas_Smart_Class * +EVAS_API const Evas_Smart_Class * evas_smart_class_get(const Evas_Smart *s) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); @@ -53,7 +53,7 @@ evas_smart_class_get(const Evas_Smart *s) return s->smart_class; } -EAPI void * +EVAS_API void * evas_smart_data_get(const Evas_Smart *s) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); @@ -62,7 +62,7 @@ evas_smart_data_get(const Evas_Smart *s) return (void *)s->smart_class->data; } -EAPI const Evas_Smart_Cb_Description ** +EVAS_API const Evas_Smart_Cb_Description ** evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); @@ -74,7 +74,7 @@ evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count) return s->callbacks.array; } -EAPI const Evas_Smart_Cb_Description * +EVAS_API const Evas_Smart_Cb_Description * evas_smart_callback_description_find(const Evas_Smart *s, const char *name) { if (!name) return NULL; @@ -84,7 +84,7 @@ evas_smart_callback_description_find(const Evas_Smart *s, const char *name) return evas_smart_cb_description_find(&s->callbacks, name); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size) { unsigned int off; @@ -116,7 +116,7 @@ evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *pare return EINA_TRUE; } -EAPI int +EVAS_API int evas_smart_usage_get(const Evas_Smart *s) { MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART); diff --git a/src/lib/evas/canvas/evas_stack.x b/src/lib/evas/canvas/evas_stack.x index ae39b65695..d390b01759 100644 --- a/src/lib/evas/canvas/evas_stack.x +++ b/src/lib/evas/canvas/evas_stack.x @@ -34,7 +34,7 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj) return NULL; } -EAPI void +EVAS_API void evas_object_raise(Evas_Object *obj) { efl_gfx_stack_raise_to_top((Evas_Object *)obj); @@ -83,7 +83,7 @@ _efl_canvas_object_efl_gfx_stack_raise_to_top(Eo *eo_obj, Evas_Object_Protected_ } } -EAPI void +EVAS_API void evas_object_lower(Evas_Object *obj) { efl_gfx_stack_lower_to_bottom((Evas_Object *)obj); @@ -133,7 +133,7 @@ _efl_canvas_object_efl_gfx_stack_lower_to_bottom(Eo *eo_obj, Evas_Object_Protect } } -EAPI void +EVAS_API void evas_object_stack_above(Evas_Object *obj, Evas_Object *above) { efl_gfx_stack_above((Evas_Object *)obj, above); @@ -227,7 +227,7 @@ _efl_canvas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_D } } -EAPI void +EVAS_API void evas_object_stack_below(Evas_Object *obj, Evas_Object *below) { efl_gfx_stack_below((Evas_Object *)obj, below); @@ -319,7 +319,7 @@ _efl_canvas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_D } } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_above_get(const Evas_Object *obj) { return efl_gfx_stack_above_get((Evas_Object *)obj); @@ -348,7 +348,7 @@ _efl_canvas_object_efl_gfx_stack_above_get(Eo *eo_obj EINA_UNUSED, return NULL; } -EAPI Evas_Object * +EVAS_API Evas_Object * evas_object_below_get(const Evas_Object *obj) { return efl_gfx_stack_below_get((Evas_Object *)obj); diff --git a/src/lib/evas/canvas/evas_stats.c b/src/lib/evas/canvas/evas_stats.c index f178fba088..e889c15cf4 100644 --- a/src/lib/evas/canvas/evas_stats.c +++ b/src/lib/evas/canvas/evas_stats.c @@ -2,48 +2,48 @@ #include "evas_private.h" //#include "evas_cs.h" -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_want_get(void) { return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_connected_get(void) { return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_stats_get(Evas_Cserve_Stats *stats EINA_UNUSED) { return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache EINA_UNUSED) { return 0; } -EAPI void +EVAS_API void evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache EINA_UNUSED) { } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_config_get(Evas_Cserve_Config *config EINA_UNUSED) { return 0; } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_cserve_config_set(const Evas_Cserve_Config *config EINA_UNUSED) { return 0; } -EAPI void +EVAS_API void evas_cserve_disconnect(void) { } diff --git a/src/lib/evas/canvas/evas_table_eo.c b/src/lib/evas/canvas/evas_table_eo.c index 88a5967c0f..d6c05cfb2d 100644 --- a/src/lib/evas/canvas/evas_table_eo.c +++ b/src/lib/evas/canvas/evas_table_eo.c @@ -1,71 +1,71 @@ void _evas_table_homogeneous_set(Eo *obj, Evas_Table_Data *pd, Evas_Object_Table_Homogeneous_Mode homogeneous); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_table_homogeneous_set, EFL_FUNC_CALL(homogeneous), Evas_Object_Table_Homogeneous_Mode homogeneous); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_table_homogeneous_set, EFL_FUNC_CALL(homogeneous), Evas_Object_Table_Homogeneous_Mode homogeneous); Evas_Object_Table_Homogeneous_Mode _evas_table_homogeneous_get(const Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_table_homogeneous_get, Evas_Object_Table_Homogeneous_Mode, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_table_homogeneous_get, Evas_Object_Table_Homogeneous_Mode, 0); void _evas_table_align_set(Eo *obj, Evas_Table_Data *pd, double horizontal, double vertical); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_table_align_set, EFL_FUNC_CALL(horizontal, vertical), double horizontal, double vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_table_align_set, EFL_FUNC_CALL(horizontal, vertical), double horizontal, double vertical); void _evas_table_align_get(const Eo *obj, Evas_Table_Data *pd, double *horizontal, double *vertical); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_align_get, EFL_FUNC_CALL(horizontal, vertical), double *horizontal, double *vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_align_get, EFL_FUNC_CALL(horizontal, vertical), double *horizontal, double *vertical); void _evas_table_padding_set(Eo *obj, Evas_Table_Data *pd, int horizontal, int vertical); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_table_padding_set, EFL_FUNC_CALL(horizontal, vertical), int horizontal, int vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_table_padding_set, EFL_FUNC_CALL(horizontal, vertical), int horizontal, int vertical); void _evas_table_padding_get(const Eo *obj, Evas_Table_Data *pd, int *horizontal, int *vertical); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_padding_get, EFL_FUNC_CALL(horizontal, vertical), int *horizontal, int *vertical); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_padding_get, EFL_FUNC_CALL(horizontal, vertical), int *horizontal, int *vertical); void _evas_table_col_row_size_get(const Eo *obj, Evas_Table_Data *pd, int *cols, int *rows); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_col_row_size_get, EFL_FUNC_CALL(cols, rows), int *cols, int *rows); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_table_col_row_size_get, EFL_FUNC_CALL(cols, rows), int *cols, int *rows); Eina_List *_evas_table_children_get(const Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_table_children_get, Eina_List *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_table_children_get, Eina_List *, NULL); Efl_Canvas_Object *_evas_table_child_get(const Eo *obj, Evas_Table_Data *pd, unsigned short col, unsigned short row); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_table_child_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(col, row), unsigned short col, unsigned short row); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_table_child_get, Efl_Canvas_Object *, NULL, EFL_FUNC_CALL(col, row), unsigned short col, unsigned short row); void _evas_table_clear(Eo *obj, Evas_Table_Data *pd, Eina_Bool clear); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_table_clear, EFL_FUNC_CALL(clear), Eina_Bool clear); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_table_clear, EFL_FUNC_CALL(clear), Eina_Bool clear); Eina_Accessor *_evas_table_accessor_new(const Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_table_accessor_new, Eina_Accessor *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_table_accessor_new, Eina_Accessor *, NULL); Eina_Iterator *_evas_table_iterator_new(const Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_table_iterator_new, Eina_Iterator *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_table_iterator_new, Eina_Iterator *, NULL); Efl_Canvas_Object *_evas_table_add_to(Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY(evas_obj_table_add_to, Efl_Canvas_Object *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_obj_table_add_to, Efl_Canvas_Object *, NULL); Eina_Bool _evas_table_pack_get(const Eo *obj, Evas_Table_Data *pd, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_table_pack_get, Eina_Bool, 0, EFL_FUNC_CALL(child, col, row, colspan, rowspan), Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_table_pack_get, Eina_Bool, 0, EFL_FUNC_CALL(child, col, row, colspan, rowspan), Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); Eina_Bool _evas_table_pack(Eo *obj, Evas_Table_Data *pd, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); -EOAPI EFL_FUNC_BODYV(evas_obj_table_pack, Eina_Bool, 0, EFL_FUNC_CALL(child, col, row, colspan, rowspan), Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_table_pack, Eina_Bool, 0, EFL_FUNC_CALL(child, col, row, colspan, rowspan), Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); Eina_Bool _evas_table_unpack(Eo *obj, Evas_Table_Data *pd, Efl_Canvas_Object *child); -EOAPI EFL_FUNC_BODYV(evas_obj_table_unpack, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV(evas_obj_table_unpack, Eina_Bool, 0, EFL_FUNC_CALL(child), Efl_Canvas_Object *child); int _evas_table_count(Eo *obj, Evas_Table_Data *pd); -EOAPI EFL_FUNC_BODY(evas_obj_table_count, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY(evas_obj_table_count, int, 0); Efl_Object *_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *pd); diff --git a/src/lib/evas/canvas/evas_table_eo.h b/src/lib/evas/canvas/evas_table_eo.h index 4eaf411535..f4c2f0c272 100644 --- a/src/lib/evas/canvas/evas_table_eo.h +++ b/src/lib/evas/canvas/evas_table_eo.h @@ -34,7 +34,7 @@ typedef enum */ #define EVAS_TABLE_CLASS evas_table_class_get() -EWAPI const Efl_Class *evas_table_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_table_class_get(void) EINA_CONST; /** * @brief Set how this table should layout children. @@ -78,7 +78,7 @@ EWAPI const Efl_Class *evas_table_class_get(void) EINA_CONST; * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_homogeneous_set(Eo *obj, Evas_Object_Table_Homogeneous_Mode homogeneous); +EVAS_API EVAS_API_WEAK void evas_obj_table_homogeneous_set(Eo *obj, Evas_Object_Table_Homogeneous_Mode homogeneous); /** * @brief Set how this table should layout children. @@ -123,7 +123,7 @@ EOAPI void evas_obj_table_homogeneous_set(Eo *obj, Evas_Object_Table_Homogeneous * * @ingroup Evas_Table */ -EOAPI Evas_Object_Table_Homogeneous_Mode evas_obj_table_homogeneous_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Evas_Object_Table_Homogeneous_Mode evas_obj_table_homogeneous_get(const Eo *obj); /** * @brief Control the alignment of the whole bounding box of contents. @@ -134,7 +134,7 @@ EOAPI Evas_Object_Table_Homogeneous_Mode evas_obj_table_homogeneous_get(const Eo * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_align_set(Eo *obj, double horizontal, double vertical); +EVAS_API EVAS_API_WEAK void evas_obj_table_align_set(Eo *obj, double horizontal, double vertical); /** * @brief Control the alignment of the whole bounding box of contents. @@ -145,7 +145,7 @@ EOAPI void evas_obj_table_align_set(Eo *obj, double horizontal, double vertical) * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_align_get(const Eo *obj, double *horizontal, double *vertical); +EVAS_API EVAS_API_WEAK void evas_obj_table_align_get(const Eo *obj, double *horizontal, double *vertical); /** * @brief Control the padding between cells. @@ -156,7 +156,7 @@ EOAPI void evas_obj_table_align_get(const Eo *obj, double *horizontal, double *v * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_padding_set(Eo *obj, int horizontal, int vertical); +EVAS_API EVAS_API_WEAK void evas_obj_table_padding_set(Eo *obj, int horizontal, int vertical); /** * @brief Control the padding between cells. @@ -167,7 +167,7 @@ EOAPI void evas_obj_table_padding_set(Eo *obj, int horizontal, int vertical); * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_padding_get(const Eo *obj, int *horizontal, int *vertical); +EVAS_API EVAS_API_WEAK void evas_obj_table_padding_get(const Eo *obj, int *horizontal, int *vertical); /** * @brief Get the number of columns and rows this table takes. @@ -182,7 +182,7 @@ EOAPI void evas_obj_table_padding_get(const Eo *obj, int *horizontal, int *verti * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_col_row_size_get(const Eo *obj, int *cols, int *rows); +EVAS_API EVAS_API_WEAK void evas_obj_table_col_row_size_get(const Eo *obj, int *cols, int *rows); /** * @brief Get the list of children for the table. @@ -198,7 +198,7 @@ EOAPI void evas_obj_table_col_row_size_get(const Eo *obj, int *cols, int *rows); * * @ingroup Evas_Table */ -EOAPI Eina_List *evas_obj_table_children_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_List *evas_obj_table_children_get(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get the child of the table at the given coordinates @@ -213,7 +213,7 @@ EOAPI Eina_List *evas_obj_table_children_get(const Eo *obj) EINA_WARN_UNUSED_RES * * @ingroup Evas_Table */ -EOAPI Efl_Canvas_Object *evas_obj_table_child_get(const Eo *obj, unsigned short col, unsigned short row); +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_table_child_get(const Eo *obj, unsigned short col, unsigned short row); /** * @brief Faster way to remove all child objects from a table object. @@ -223,7 +223,7 @@ EOAPI Efl_Canvas_Object *evas_obj_table_child_get(const Eo *obj, unsigned short * * @ingroup Evas_Table */ -EOAPI void evas_obj_table_clear(Eo *obj, Eina_Bool clear); +EVAS_API EVAS_API_WEAK void evas_obj_table_clear(Eo *obj, Eina_Bool clear); /** * @brief Get an accessor to get random access to the list of children for the @@ -237,7 +237,7 @@ EOAPI void evas_obj_table_clear(Eo *obj, Eina_Bool clear); * * @ingroup Evas_Table */ -EOAPI Eina_Accessor *evas_obj_table_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Accessor *evas_obj_table_accessor_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get an iterator to walk the list of children for the table. @@ -250,7 +250,7 @@ EOAPI Eina_Accessor *evas_obj_table_accessor_new(const Eo *obj) EINA_WARN_UNUSED * * @ingroup Evas_Table */ -EOAPI Eina_Iterator *evas_obj_table_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Eina_Iterator *evas_obj_table_iterator_new(const Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Create a table that is child of a given element @c parent. @@ -261,7 +261,7 @@ EOAPI Eina_Iterator *evas_obj_table_iterator_new(const Eo *obj) EINA_WARN_UNUSED * * @ingroup Evas_Table */ -EOAPI Efl_Canvas_Object *evas_obj_table_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API EVAS_API_WEAK Efl_Canvas_Object *evas_obj_table_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get packing location of a child of table @@ -282,7 +282,7 @@ EOAPI Efl_Canvas_Object *evas_obj_table_add_to(Eo *obj) EINA_WARN_UNUSED_RESULT; * * @ingroup Evas_Table */ -EOAPI Eina_Bool evas_obj_table_pack_get(const Eo *obj, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_table_pack_get(const Eo *obj, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); /** * @brief Add a new child to a table object or set its current packing. @@ -306,7 +306,7 @@ EOAPI Eina_Bool evas_obj_table_pack_get(const Eo *obj, Efl_Canvas_Object *child, * * @ingroup Evas_Table */ -EOAPI Eina_Bool evas_obj_table_pack(Eo *obj, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_table_pack(Eo *obj, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) EINA_ARG_NONNULL(2); /** * @brief Remove child from table. @@ -322,7 +322,7 @@ EOAPI Eina_Bool evas_obj_table_pack(Eo *obj, Efl_Canvas_Object *child, unsigned * * @ingroup Evas_Table */ -EOAPI Eina_Bool evas_obj_table_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_table_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); /** * @brief Returns the number of items in the table @@ -333,6 +333,6 @@ EOAPI Eina_Bool evas_obj_table_unpack(Eo *obj, Efl_Canvas_Object *child) EINA_AR * * @ingroup Evas_Table */ -EOAPI int evas_obj_table_count(Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_table_count(Eo *obj); #endif diff --git a/src/lib/evas/canvas/evas_table_eo.legacy.c b/src/lib/evas/canvas/evas_table_eo.legacy.c index 9e449a38d9..bbec2b6eab 100644 --- a/src/lib/evas/canvas/evas_table_eo.legacy.c +++ b/src/lib/evas/canvas/evas_table_eo.legacy.c @@ -1,95 +1,95 @@ -EAPI void +EVAS_API void evas_object_table_homogeneous_set(Evas_Table *obj, Evas_Object_Table_Homogeneous_Mode homogeneous) { evas_obj_table_homogeneous_set(obj, homogeneous); } -EAPI Evas_Object_Table_Homogeneous_Mode +EVAS_API Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get(const Evas_Table *obj) { return evas_obj_table_homogeneous_get(obj); } -EAPI void +EVAS_API void evas_object_table_align_set(Evas_Table *obj, double horizontal, double vertical) { evas_obj_table_align_set(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_table_align_get(const Evas_Table *obj, double *horizontal, double *vertical) { evas_obj_table_align_get(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_table_padding_set(Evas_Table *obj, int horizontal, int vertical) { evas_obj_table_padding_set(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_table_padding_get(const Evas_Table *obj, int *horizontal, int *vertical) { evas_obj_table_padding_get(obj, horizontal, vertical); } -EAPI void +EVAS_API void evas_object_table_col_row_size_get(const Evas_Table *obj, int *cols, int *rows) { evas_obj_table_col_row_size_get(obj, cols, rows); } -EAPI Eina_List * +EVAS_API Eina_List * evas_object_table_children_get(const Evas_Table *obj) { return evas_obj_table_children_get(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_table_child_get(const Evas_Table *obj, unsigned short col, unsigned short row) { return evas_obj_table_child_get(obj, col, row); } -EAPI void +EVAS_API void evas_object_table_clear(Evas_Table *obj, Eina_Bool clear) { evas_obj_table_clear(obj, clear); } -EAPI Eina_Accessor * +EVAS_API Eina_Accessor * evas_object_table_accessor_new(const Evas_Table *obj) { return evas_obj_table_accessor_new(obj); } -EAPI Eina_Iterator * +EVAS_API Eina_Iterator * evas_object_table_iterator_new(const Evas_Table *obj) { return evas_obj_table_iterator_new(obj); } -EAPI Efl_Canvas_Object * +EVAS_API Efl_Canvas_Object * evas_object_table_add_to(Evas_Table *obj) { return evas_obj_table_add_to(obj); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_table_pack_get(const Evas_Table *obj, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan) { return evas_obj_table_pack_get(obj, child, col, row, colspan, rowspan); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_table_pack(Evas_Table *obj, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) { return evas_obj_table_pack(obj, child, col, row, colspan, rowspan); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_table_unpack(Evas_Table *obj, Efl_Canvas_Object *child) { return evas_obj_table_unpack(obj, child); diff --git a/src/lib/evas/canvas/evas_table_eo.legacy.h b/src/lib/evas/canvas/evas_table_eo.legacy.h index d7fc5d1b1b..70ae788c32 100644 --- a/src/lib/evas/canvas/evas_table_eo.legacy.h +++ b/src/lib/evas/canvas/evas_table_eo.legacy.h @@ -71,7 +71,7 @@ typedef enum * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_homogeneous_set(Evas_Table *obj, Evas_Object_Table_Homogeneous_Mode homogeneous); +EVAS_API void evas_object_table_homogeneous_set(Evas_Table *obj, Evas_Object_Table_Homogeneous_Mode homogeneous); /** * @brief Set how this table should layout children. @@ -116,7 +116,7 @@ EAPI void evas_object_table_homogeneous_set(Evas_Table *obj, Evas_Object_Table_H * * @ingroup Evas_Object_Table_Group */ -EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get(const Evas_Table *obj); +EVAS_API Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get(const Evas_Table *obj); /** * @brief Control the alignment of the whole bounding box of contents. @@ -127,7 +127,7 @@ EAPI Evas_Object_Table_Homogeneous_Mode evas_object_table_homogeneous_get(const * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_align_set(Evas_Table *obj, double horizontal, double vertical); +EVAS_API void evas_object_table_align_set(Evas_Table *obj, double horizontal, double vertical); /** * @brief Control the alignment of the whole bounding box of contents. @@ -138,7 +138,7 @@ EAPI void evas_object_table_align_set(Evas_Table *obj, double horizontal, double * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_align_get(const Evas_Table *obj, double *horizontal, double *vertical); +EVAS_API void evas_object_table_align_get(const Evas_Table *obj, double *horizontal, double *vertical); /** * @brief Control the padding between cells. @@ -149,7 +149,7 @@ EAPI void evas_object_table_align_get(const Evas_Table *obj, double *horizontal, * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_padding_set(Evas_Table *obj, int horizontal, int vertical); +EVAS_API void evas_object_table_padding_set(Evas_Table *obj, int horizontal, int vertical); /** * @brief Control the padding between cells. @@ -160,7 +160,7 @@ EAPI void evas_object_table_padding_set(Evas_Table *obj, int horizontal, int ver * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_padding_get(const Evas_Table *obj, int *horizontal, int *vertical); +EVAS_API void evas_object_table_padding_get(const Evas_Table *obj, int *horizontal, int *vertical); /** * @brief Get the number of columns and rows this table takes. @@ -175,7 +175,7 @@ EAPI void evas_object_table_padding_get(const Evas_Table *obj, int *horizontal, * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_col_row_size_get(const Evas_Table *obj, int *cols, int *rows); +EVAS_API void evas_object_table_col_row_size_get(const Evas_Table *obj, int *cols, int *rows); /** * @brief Get the list of children for the table. @@ -191,7 +191,7 @@ EAPI void evas_object_table_col_row_size_get(const Evas_Table *obj, int *cols, i * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_List *evas_object_table_children_get(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_List *evas_object_table_children_get(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get the child of the table at the given coordinates @@ -206,7 +206,7 @@ EAPI Eina_List *evas_object_table_children_get(const Evas_Table *obj) EINA_WARN_ * * @ingroup Evas_Object_Table_Group */ -EAPI Efl_Canvas_Object *evas_object_table_child_get(const Evas_Table *obj, unsigned short col, unsigned short row); +EVAS_API Efl_Canvas_Object *evas_object_table_child_get(const Evas_Table *obj, unsigned short col, unsigned short row); /** * @brief Faster way to remove all child objects from a table object. @@ -216,7 +216,7 @@ EAPI Efl_Canvas_Object *evas_object_table_child_get(const Evas_Table *obj, unsig * * @ingroup Evas_Object_Table_Group */ -EAPI void evas_object_table_clear(Evas_Table *obj, Eina_Bool clear); +EVAS_API void evas_object_table_clear(Evas_Table *obj, Eina_Bool clear); /** * @brief Get an accessor to get random access to the list of children for the @@ -230,7 +230,7 @@ EAPI void evas_object_table_clear(Evas_Table *obj, Eina_Bool clear); * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_Accessor *evas_object_table_accessor_new(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Accessor *evas_object_table_accessor_new(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get an iterator to walk the list of children for the table. @@ -243,7 +243,7 @@ EAPI Eina_Accessor *evas_object_table_accessor_new(const Evas_Table *obj) EINA_W * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_Iterator *evas_object_table_iterator_new(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Eina_Iterator *evas_object_table_iterator_new(const Evas_Table *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Create a table that is child of a given element @c parent. @@ -254,7 +254,7 @@ EAPI Eina_Iterator *evas_object_table_iterator_new(const Evas_Table *obj) EINA_W * * @ingroup Evas_Object_Table_Group */ -EAPI Efl_Canvas_Object *evas_object_table_add_to(Evas_Table *obj) EINA_WARN_UNUSED_RESULT; +EVAS_API Efl_Canvas_Object *evas_object_table_add_to(Evas_Table *obj) EINA_WARN_UNUSED_RESULT; /** * @brief Get packing location of a child of table @@ -275,7 +275,7 @@ EAPI Efl_Canvas_Object *evas_object_table_add_to(Evas_Table *obj) EINA_WARN_UNUS * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_Bool evas_object_table_pack_get(const Evas_Table *obj, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); +EVAS_API Eina_Bool evas_object_table_pack_get(const Evas_Table *obj, Efl_Canvas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan); /** * @brief Add a new child to a table object or set its current packing. @@ -299,7 +299,7 @@ EAPI Eina_Bool evas_object_table_pack_get(const Evas_Table *obj, Efl_Canvas_Obje * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_Bool evas_object_table_pack(Evas_Table *obj, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) EINA_ARG_NONNULL(2); +EVAS_API Eina_Bool evas_object_table_pack(Evas_Table *obj, Efl_Canvas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) EINA_ARG_NONNULL(2); /** * @brief Remove child from table. @@ -315,7 +315,7 @@ EAPI Eina_Bool evas_object_table_pack(Evas_Table *obj, Efl_Canvas_Object *child, * * @ingroup Evas_Object_Table_Group */ -EAPI Eina_Bool evas_object_table_unpack(Evas_Table *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); +EVAS_API Eina_Bool evas_object_table_unpack(Evas_Table *obj, Efl_Canvas_Object *child) EINA_ARG_NONNULL(2); #endif diff --git a/src/lib/evas/canvas/evas_text_eo.c b/src/lib/evas/canvas/evas_text_eo.c index b2139f82d1..6cc1824163 100644 --- a/src/lib/evas/canvas/evas_text_eo.c +++ b/src/lib/evas/canvas/evas_text_eo.c @@ -1,11 +1,11 @@ void _evas_text_shadow_color_set(Eo *obj, Evas_Text_Data *pd, int r, int g, int b, int a); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_shadow_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_shadow_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); void _evas_text_shadow_color_get(const Eo *obj, Evas_Text_Data *pd, int *r, int *g, int *b, int *a); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_shadow_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_shadow_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); void _evas_text_ellipsis_set(Eo *obj, Evas_Text_Data *pd, double ellipsis); @@ -25,7 +25,7 @@ __eolian_evas_text_ellipsis_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_ellipsis_set, EFL_FUNC_CALL(ellipsis), double ellipsis); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_ellipsis_set, EFL_FUNC_CALL(ellipsis), double ellipsis); double _evas_text_ellipsis_get(const Eo *obj, Evas_Text_Data *pd); @@ -37,7 +37,7 @@ __eolian_evas_text_ellipsis_get_reflect(const Eo *obj) return eina_value_double_init(val); } -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_ellipsis_get, double, -1.000000 /* +1.000000 */); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_ellipsis_get, double, -1.000000 /* +1.000000 */); void _evas_text_bidi_delimiters_set(Eo *obj, Evas_Text_Data *pd, const char *delim); @@ -57,7 +57,7 @@ __eolian_evas_text_bidi_delimiters_set_reflect(Eo *obj, Eina_Value val) return r; } -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_bidi_delimiters_set, EFL_FUNC_CALL(delim), const char *delim); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_bidi_delimiters_set, EFL_FUNC_CALL(delim), const char *delim); const char *_evas_text_bidi_delimiters_get(const Eo *obj, Evas_Text_Data *pd); @@ -69,87 +69,87 @@ __eolian_evas_text_bidi_delimiters_get_reflect(const Eo *obj) return eina_value_string_init(val); } -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_bidi_delimiters_get, const char *, NULL); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_bidi_delimiters_get, const char *, NULL); void _evas_text_outline_color_set(Eo *obj, Evas_Text_Data *pd, int r, int g, int b, int a); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_outline_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_outline_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); void _evas_text_outline_color_get(const Eo *obj, Evas_Text_Data *pd, int *r, int *g, int *b, int *a); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_outline_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_outline_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); void _evas_text_glow2_color_set(Eo *obj, Evas_Text_Data *pd, int r, int g, int b, int a); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_glow2_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_glow2_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); void _evas_text_glow2_color_get(const Eo *obj, Evas_Text_Data *pd, int *r, int *g, int *b, int *a); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_glow2_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_glow2_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); void _evas_text_style_set(Eo *obj, Evas_Text_Data *pd, Evas_Text_Style_Type style); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_style_set, EFL_FUNC_CALL(style), Evas_Text_Style_Type style); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_style_set, EFL_FUNC_CALL(style), Evas_Text_Style_Type style); Evas_Text_Style_Type _evas_text_style_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_style_get, Evas_Text_Style_Type, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_style_get, Evas_Text_Style_Type, 0); void _evas_text_glow_color_set(Eo *obj, Evas_Text_Data *pd, int r, int g, int b, int a); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_text_glow_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_text_glow_color_set, EFL_FUNC_CALL(r, g, b, a), int r, int g, int b, int a); void _evas_text_glow_color_get(const Eo *obj, Evas_Text_Data *pd, int *r, int *g, int *b, int *a); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_glow_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_glow_color_get, EFL_FUNC_CALL(r, g, b, a), int *r, int *g, int *b, int *a); int _evas_text_max_descent_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_max_descent_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_max_descent_get, int, 0); void _evas_text_style_pad_get(const Eo *obj, Evas_Text_Data *pd, int *l, int *r, int *t, int *b); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_style_pad_get, EFL_FUNC_CALL(l, r, t, b), int *l, int *r, int *t, int *b); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_text_style_pad_get, EFL_FUNC_CALL(l, r, t, b), int *l, int *r, int *t, int *b); Efl_Text_Bidirectional_Type _evas_text_direction_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_direction_get, Efl_Text_Bidirectional_Type, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_direction_get, Efl_Text_Bidirectional_Type, 0); int _evas_text_ascent_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_ascent_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_ascent_get, int, 0); int _evas_text_horiz_advance_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_horiz_advance_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_horiz_advance_get, int, 0); int _evas_text_inset_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_inset_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_inset_get, int, 0); int _evas_text_max_ascent_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_max_ascent_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_max_ascent_get, int, 0); int _evas_text_vert_advance_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_vert_advance_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_vert_advance_get, int, 0); int _evas_text_descent_get(const Eo *obj, Evas_Text_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_text_descent_get, int, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_text_descent_get, int, 0); int _evas_text_last_up_to_pos(const Eo *obj, Evas_Text_Data *pd, int x, int y); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_text_last_up_to_pos, int, -1 /* +1 */, EFL_FUNC_CALL(x, y), int x, int y); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_text_last_up_to_pos, int, -1 /* +1 */, EFL_FUNC_CALL(x, y), int x, int y); int _evas_text_char_coords_get(const Eo *obj, Evas_Text_Data *pd, int x, int y, int *cx, int *cy, int *cw, int *ch); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_text_char_coords_get, int, 0, EFL_FUNC_CALL(x, y, cx, cy, cw, ch), int x, int y, int *cx, int *cy, int *cw, int *ch); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_text_char_coords_get, int, 0, EFL_FUNC_CALL(x, y, cx, cy, cw, ch), int x, int y, int *cx, int *cy, int *cw, int *ch); Eina_Bool _evas_text_char_pos_get(const Eo *obj, Evas_Text_Data *pd, int pos, int *cx, int *cy, int *cw, int *ch); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_text_char_pos_get, Eina_Bool, 0, EFL_FUNC_CALL(pos, cx, cy, cw, ch), int pos, int *cx, int *cy, int *cw, int *ch); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_text_char_pos_get, Eina_Bool, 0, EFL_FUNC_CALL(pos, cx, cy, cw, ch), int pos, int *cx, int *cy, int *cw, int *ch); Efl_Object *_evas_text_efl_object_constructor(Eo *obj, Evas_Text_Data *pd); diff --git a/src/lib/evas/canvas/evas_text_eo.h b/src/lib/evas/canvas/evas_text_eo.h index a48652ec43..c1c7e6b94d 100644 --- a/src/lib/evas/canvas/evas_text_eo.h +++ b/src/lib/evas/canvas/evas_text_eo.h @@ -19,7 +19,7 @@ typedef Eo Evas_Text; */ #define EVAS_TEXT_CLASS evas_text_class_get() -EWAPI const Efl_Class *evas_text_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_text_class_get(void) EINA_CONST; /** * @brief Controls the shadow color for the given text object. @@ -46,7 +46,7 @@ EWAPI const Efl_Class *evas_text_class_get(void) EINA_CONST; * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_shadow_color_set(Eo *obj, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK void evas_obj_text_shadow_color_set(Eo *obj, int r, int g, int b, int a); /** * @brief Controls the shadow color for the given text object. @@ -76,7 +76,7 @@ EOAPI void evas_obj_text_shadow_color_set(Eo *obj, int r, int g, int b, int a); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_shadow_color_get(const Eo *obj, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK void evas_obj_text_shadow_color_get(const Eo *obj, int *r, int *g, int *b, int *a); /** * @brief Controls the ellipsis that should be used for the text object. @@ -94,7 +94,7 @@ EOAPI void evas_obj_text_shadow_color_get(const Eo *obj, int *r, int *g, int *b, * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_ellipsis_set(Eo *obj, double ellipsis); +EVAS_API EVAS_API_WEAK void evas_obj_text_ellipsis_set(Eo *obj, double ellipsis); /** * @brief Controls the ellipsis that should be used for the text object. @@ -113,7 +113,7 @@ EOAPI void evas_obj_text_ellipsis_set(Eo *obj, double ellipsis); * * @ingroup Evas_Text */ -EOAPI double evas_obj_text_ellipsis_get(const Eo *obj); +EVAS_API EVAS_API_WEAK double evas_obj_text_ellipsis_get(const Eo *obj); /** * @brief Sets the BiDi delimiters used in the textblock. @@ -129,7 +129,7 @@ EOAPI double evas_obj_text_ellipsis_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_bidi_delimiters_set(Eo *obj, const char *delim); +EVAS_API EVAS_API_WEAK void evas_obj_text_bidi_delimiters_set(Eo *obj, const char *delim); /** * @brief Sets the BiDi delimiters used in the textblock. @@ -146,7 +146,7 @@ EOAPI void evas_obj_text_bidi_delimiters_set(Eo *obj, const char *delim); * * @ingroup Evas_Text */ -EOAPI const char *evas_obj_text_bidi_delimiters_get(const Eo *obj); +EVAS_API EVAS_API_WEAK const char *evas_obj_text_bidi_delimiters_get(const Eo *obj); /** * @brief Controls the outline color for the given text object. @@ -165,7 +165,7 @@ EOAPI const char *evas_obj_text_bidi_delimiters_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_outline_color_set(Eo *obj, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK void evas_obj_text_outline_color_set(Eo *obj, int r, int g, int b, int a); /** * @brief Controls the outline color for the given text object. @@ -184,7 +184,7 @@ EOAPI void evas_obj_text_outline_color_set(Eo *obj, int r, int g, int b, int a); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_outline_color_get(const Eo *obj, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK void evas_obj_text_outline_color_get(const Eo *obj, int *r, int *g, int *b, int *a); /** * @brief Sets the 'glow 2' color for the given text object. @@ -202,7 +202,7 @@ EOAPI void evas_obj_text_outline_color_get(const Eo *obj, int *r, int *g, int *b * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_glow2_color_set(Eo *obj, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK void evas_obj_text_glow2_color_set(Eo *obj, int r, int g, int b, int a); /** * @brief Sets the 'glow 2' color for the given text object. @@ -220,7 +220,7 @@ EOAPI void evas_obj_text_glow2_color_set(Eo *obj, int r, int g, int b, int a); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_glow2_color_get(const Eo *obj, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK void evas_obj_text_glow2_color_get(const Eo *obj, int *r, int *g, int *b, int *a); /** * @brief Controls the style to apply on the given text object. @@ -237,7 +237,7 @@ EOAPI void evas_obj_text_glow2_color_get(const Eo *obj, int *r, int *g, int *b, * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_style_set(Eo *obj, Evas_Text_Style_Type style); +EVAS_API EVAS_API_WEAK void evas_obj_text_style_set(Eo *obj, Evas_Text_Style_Type style); /** * @brief Controls the style to apply on the given text object. @@ -255,7 +255,7 @@ EOAPI void evas_obj_text_style_set(Eo *obj, Evas_Text_Style_Type style); * * @ingroup Evas_Text */ -EOAPI Evas_Text_Style_Type evas_obj_text_style_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Evas_Text_Style_Type evas_obj_text_style_get(const Eo *obj); /** * @brief Sets the glow color for the given text object. @@ -276,7 +276,7 @@ EOAPI Evas_Text_Style_Type evas_obj_text_style_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_glow_color_set(Eo *obj, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK void evas_obj_text_glow_color_set(Eo *obj, int r, int g, int b, int a); /** * @brief Sets the glow color for the given text object. @@ -297,7 +297,7 @@ EOAPI void evas_obj_text_glow_color_set(Eo *obj, int r, int g, int b, int a); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_glow_color_get(const Eo *obj, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK void evas_obj_text_glow_color_get(const Eo *obj, int *r, int *g, int *b, int *a); /** * @brief Maximal descent property @@ -308,7 +308,7 @@ EOAPI void evas_obj_text_glow_color_get(const Eo *obj, int *r, int *g, int *b, i * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_max_descent_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_max_descent_get(const Eo *obj); /** * @brief Gets the text style pad of a text object. @@ -321,7 +321,7 @@ EOAPI int evas_obj_text_max_descent_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI void evas_obj_text_style_pad_get(const Eo *obj, int *l, int *r, int *t, int *b); +EVAS_API EVAS_API_WEAK void evas_obj_text_style_pad_get(const Eo *obj, int *l, int *r, int *t, int *b); /** * @brief Retrieves the direction of the text currently being displayed in the @@ -333,7 +333,7 @@ EOAPI void evas_obj_text_style_pad_get(const Eo *obj, int *l, int *r, int *t, in * * @ingroup Evas_Text */ -EOAPI Efl_Text_Bidirectional_Type evas_obj_text_direction_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Efl_Text_Bidirectional_Type evas_obj_text_direction_get(const Eo *obj); /** * @brief Ascent property @@ -344,7 +344,7 @@ EOAPI Efl_Text_Bidirectional_Type evas_obj_text_direction_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_ascent_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_ascent_get(const Eo *obj); /** * @brief Horizontal advance property @@ -355,7 +355,7 @@ EOAPI int evas_obj_text_ascent_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_horiz_advance_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_horiz_advance_get(const Eo *obj); /** * @brief Inset property @@ -366,7 +366,7 @@ EOAPI int evas_obj_text_horiz_advance_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_inset_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_inset_get(const Eo *obj); /** * @brief Maximal ascent property @@ -377,7 +377,7 @@ EOAPI int evas_obj_text_inset_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_max_ascent_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_max_ascent_get(const Eo *obj); /** * @brief Vertical advance property @@ -388,7 +388,7 @@ EOAPI int evas_obj_text_max_ascent_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_vert_advance_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_vert_advance_get(const Eo *obj); /** * @brief descent property @@ -399,7 +399,7 @@ EOAPI int evas_obj_text_vert_advance_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_descent_get(const Eo *obj); +EVAS_API EVAS_API_WEAK int evas_obj_text_descent_get(const Eo *obj); /** * @brief Returns the logical position of the last char in the text up to the @@ -416,7 +416,7 @@ EOAPI int evas_obj_text_descent_get(const Eo *obj); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_last_up_to_pos(const Eo *obj, int x, int y); +EVAS_API EVAS_API_WEAK int evas_obj_text_last_up_to_pos(const Eo *obj, int x, int y); /** * @brief Get character coordinates @@ -433,7 +433,7 @@ EOAPI int evas_obj_text_last_up_to_pos(const Eo *obj, int x, int y); * * @ingroup Evas_Text */ -EOAPI int evas_obj_text_char_coords_get(const Eo *obj, int x, int y, int *cx, int *cy, int *cw, int *ch); +EVAS_API EVAS_API_WEAK int evas_obj_text_char_coords_get(const Eo *obj, int x, int y, int *cx, int *cy, int *cw, int *ch); /** * @brief Retrieve position and dimension information of a character within a @@ -457,6 +457,6 @@ EOAPI int evas_obj_text_char_coords_get(const Eo *obj, int x, int y, int *cx, in * * @ingroup Evas_Text */ -EOAPI Eina_Bool evas_obj_text_char_pos_get(const Eo *obj, int pos, int *cx, int *cy, int *cw, int *ch); +EVAS_API EVAS_API_WEAK Eina_Bool evas_obj_text_char_pos_get(const Eo *obj, int pos, int *cx, int *cy, int *cw, int *ch); #endif diff --git a/src/lib/evas/canvas/evas_text_eo.legacy.c b/src/lib/evas/canvas/evas_text_eo.legacy.c index dca5395e10..03a1672a61 100644 --- a/src/lib/evas/canvas/evas_text_eo.legacy.c +++ b/src/lib/evas/canvas/evas_text_eo.legacy.c @@ -1,155 +1,155 @@ -EAPI void +EVAS_API void evas_object_text_shadow_color_set(Evas_Text *obj, int r, int g, int b, int a) { evas_obj_text_shadow_color_set(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_shadow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a) { evas_obj_text_shadow_color_get(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_ellipsis_set(Evas_Text *obj, double ellipsis) { evas_obj_text_ellipsis_set(obj, ellipsis); } -EAPI double +EVAS_API double evas_object_text_ellipsis_get(const Evas_Text *obj) { return evas_obj_text_ellipsis_get(obj); } -EAPI void +EVAS_API void evas_object_text_bidi_delimiters_set(Evas_Text *obj, const char *delim) { evas_obj_text_bidi_delimiters_set(obj, delim); } -EAPI const char * +EVAS_API const char * evas_object_text_bidi_delimiters_get(const Evas_Text *obj) { return evas_obj_text_bidi_delimiters_get(obj); } -EAPI void +EVAS_API void evas_object_text_outline_color_set(Evas_Text *obj, int r, int g, int b, int a) { evas_obj_text_outline_color_set(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_outline_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a) { evas_obj_text_outline_color_get(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_glow2_color_set(Evas_Text *obj, int r, int g, int b, int a) { evas_obj_text_glow2_color_set(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_glow2_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a) { evas_obj_text_glow2_color_get(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_style_set(Evas_Text *obj, Evas_Text_Style_Type style) { evas_obj_text_style_set(obj, style); } -EAPI Evas_Text_Style_Type +EVAS_API Evas_Text_Style_Type evas_object_text_style_get(const Evas_Text *obj) { return evas_obj_text_style_get(obj); } -EAPI void +EVAS_API void evas_object_text_glow_color_set(Evas_Text *obj, int r, int g, int b, int a) { evas_obj_text_glow_color_set(obj, r, g, b, a); } -EAPI void +EVAS_API void evas_object_text_glow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a) { evas_obj_text_glow_color_get(obj, r, g, b, a); } -EAPI int +EVAS_API int evas_object_text_max_descent_get(const Evas_Text *obj) { return evas_obj_text_max_descent_get(obj); } -EAPI void +EVAS_API void evas_object_text_style_pad_get(const Evas_Text *obj, int *l, int *r, int *t, int *b) { evas_obj_text_style_pad_get(obj, l, r, t, b); } -EAPI Efl_Text_Bidirectional_Type +EVAS_API Efl_Text_Bidirectional_Type evas_object_text_direction_get(const Evas_Text *obj) { return evas_obj_text_direction_get(obj); } -EAPI int +EVAS_API int evas_object_text_ascent_get(const Evas_Text *obj) { return evas_obj_text_ascent_get(obj); } -EAPI int +EVAS_API int evas_object_text_horiz_advance_get(const Evas_Text *obj) { return evas_obj_text_horiz_advance_get(obj); } -EAPI int +EVAS_API int evas_object_text_inset_get(const Evas_Text *obj) { return evas_obj_text_inset_get(obj); } -EAPI int +EVAS_API int evas_object_text_max_ascent_get(const Evas_Text *obj) { return evas_obj_text_max_ascent_get(obj); } -EAPI int +EVAS_API int evas_object_text_vert_advance_get(const Evas_Text *obj) { return evas_obj_text_vert_advance_get(obj); } -EAPI int +EVAS_API int evas_object_text_descent_get(const Evas_Text *obj) { return evas_obj_text_descent_get(obj); } -EAPI int +EVAS_API int evas_object_text_last_up_to_pos(const Evas_Text *obj, int x, int y) { return evas_obj_text_last_up_to_pos(obj, x, y); } -EAPI int +EVAS_API int evas_object_text_char_coords_get(const Evas_Text *obj, int x, int y, int *cx, int *cy, int *cw, int *ch) { return evas_obj_text_char_coords_get(obj, x, y, cx, cy, cw, ch); } -EAPI Eina_Bool +EVAS_API Eina_Bool evas_object_text_char_pos_get(const Evas_Text *obj, int pos, int *cx, int *cy, int *cw, int *ch) { return evas_obj_text_char_pos_get(obj, pos, cx, cy, cw, ch); diff --git a/src/lib/evas/canvas/evas_text_eo.legacy.h b/src/lib/evas/canvas/evas_text_eo.legacy.h index 9d43f65ee0..50183fbd74 100644 --- a/src/lib/evas/canvas/evas_text_eo.legacy.h +++ b/src/lib/evas/canvas/evas_text_eo.legacy.h @@ -39,7 +39,7 @@ typedef Eo Evas_Text; * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_shadow_color_set(Evas_Text *obj, int r, int g, int b, int a); +EVAS_API void evas_object_text_shadow_color_set(Evas_Text *obj, int r, int g, int b, int a); /** * @brief Controls the shadow color for the given text object. @@ -69,7 +69,7 @@ EAPI void evas_object_text_shadow_color_set(Evas_Text *obj, int r, int g, int b, * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_shadow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); +EVAS_API void evas_object_text_shadow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); /** * @brief Controls the ellipsis that should be used for the text object. @@ -87,7 +87,7 @@ EAPI void evas_object_text_shadow_color_get(const Evas_Text *obj, int *r, int *g * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_ellipsis_set(Evas_Text *obj, double ellipsis); +EVAS_API void evas_object_text_ellipsis_set(Evas_Text *obj, double ellipsis); /** * @brief Controls the ellipsis that should be used for the text object. @@ -106,7 +106,7 @@ EAPI void evas_object_text_ellipsis_set(Evas_Text *obj, double ellipsis); * * @ingroup Evas_Object_Text_Group */ -EAPI double evas_object_text_ellipsis_get(const Evas_Text *obj); +EVAS_API double evas_object_text_ellipsis_get(const Evas_Text *obj); /** * @brief Sets the BiDi delimiters used in the textblock. @@ -122,7 +122,7 @@ EAPI double evas_object_text_ellipsis_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_bidi_delimiters_set(Evas_Text *obj, const char *delim); +EVAS_API void evas_object_text_bidi_delimiters_set(Evas_Text *obj, const char *delim); /** * @brief Sets the BiDi delimiters used in the textblock. @@ -139,7 +139,7 @@ EAPI void evas_object_text_bidi_delimiters_set(Evas_Text *obj, const char *delim * * @ingroup Evas_Object_Text_Group */ -EAPI const char *evas_object_text_bidi_delimiters_get(const Evas_Text *obj); +EVAS_API const char *evas_object_text_bidi_delimiters_get(const Evas_Text *obj); /** * @brief Controls the outline color for the given text object. @@ -158,7 +158,7 @@ EAPI const char *evas_object_text_bidi_delimiters_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_outline_color_set(Evas_Text *obj, int r, int g, int b, int a); +EVAS_API void evas_object_text_outline_color_set(Evas_Text *obj, int r, int g, int b, int a); /** * @brief Controls the outline color for the given text object. @@ -177,7 +177,7 @@ EAPI void evas_object_text_outline_color_set(Evas_Text *obj, int r, int g, int b * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_outline_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); +EVAS_API void evas_object_text_outline_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); /** * @brief Sets the 'glow 2' color for the given text object. @@ -195,7 +195,7 @@ EAPI void evas_object_text_outline_color_get(const Evas_Text *obj, int *r, int * * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_glow2_color_set(Evas_Text *obj, int r, int g, int b, int a); +EVAS_API void evas_object_text_glow2_color_set(Evas_Text *obj, int r, int g, int b, int a); /** * @brief Sets the 'glow 2' color for the given text object. @@ -213,7 +213,7 @@ EAPI void evas_object_text_glow2_color_set(Evas_Text *obj, int r, int g, int b, * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_glow2_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); +EVAS_API void evas_object_text_glow2_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); /** * @brief Controls the style to apply on the given text object. @@ -230,7 +230,7 @@ EAPI void evas_object_text_glow2_color_get(const Evas_Text *obj, int *r, int *g, * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_style_set(Evas_Text *obj, Evas_Text_Style_Type style); +EVAS_API void evas_object_text_style_set(Evas_Text *obj, Evas_Text_Style_Type style); /** * @brief Controls the style to apply on the given text object. @@ -248,7 +248,7 @@ EAPI void evas_object_text_style_set(Evas_Text *obj, Evas_Text_Style_Type style) * * @ingroup Evas_Object_Text_Group */ -EAPI Evas_Text_Style_Type evas_object_text_style_get(const Evas_Text *obj); +EVAS_API Evas_Text_Style_Type evas_object_text_style_get(const Evas_Text *obj); /** * @brief Sets the glow color for the given text object. @@ -269,7 +269,7 @@ EAPI Evas_Text_Style_Type evas_object_text_style_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_glow_color_set(Evas_Text *obj, int r, int g, int b, int a); +EVAS_API void evas_object_text_glow_color_set(Evas_Text *obj, int r, int g, int b, int a); /** * @brief Sets the glow color for the given text object. @@ -290,7 +290,7 @@ EAPI void evas_object_text_glow_color_set(Evas_Text *obj, int r, int g, int b, i * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_glow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); +EVAS_API void evas_object_text_glow_color_get(const Evas_Text *obj, int *r, int *g, int *b, int *a); /** * @brief Maximal descent property @@ -301,7 +301,7 @@ EAPI void evas_object_text_glow_color_get(const Evas_Text *obj, int *r, int *g, * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_max_descent_get(const Evas_Text *obj); +EVAS_API int evas_object_text_max_descent_get(const Evas_Text *obj); /** * @brief Gets the text style pad of a text object. @@ -314,7 +314,7 @@ EAPI int evas_object_text_max_descent_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI void evas_object_text_style_pad_get(const Evas_Text *obj, int *l, int *r, int *t, int *b); +EVAS_API void evas_object_text_style_pad_get(const Evas_Text *obj, int *l, int *r, int *t, int *b); /** * @brief Retrieves the direction of the text currently being displayed in the @@ -326,7 +326,7 @@ EAPI void evas_object_text_style_pad_get(const Evas_Text *obj, int *l, int *r, i * * @ingroup Evas_Object_Text_Group */ -EAPI Efl_Text_Bidirectional_Type evas_object_text_direction_get(const Evas_Text *obj); +EVAS_API Efl_Text_Bidirectional_Type evas_object_text_direction_get(const Evas_Text *obj); /** * @brief Ascent property @@ -337,7 +337,7 @@ EAPI Efl_Text_Bidirectional_Type evas_object_text_direction_get(const Evas_Text * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_ascent_get(const Evas_Text *obj); +EVAS_API int evas_object_text_ascent_get(const Evas_Text *obj); /** * @brief Horizontal advance property @@ -348,7 +348,7 @@ EAPI int evas_object_text_ascent_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_horiz_advance_get(const Evas_Text *obj); +EVAS_API int evas_object_text_horiz_advance_get(const Evas_Text *obj); /** * @brief Inset property @@ -359,7 +359,7 @@ EAPI int evas_object_text_horiz_advance_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_inset_get(const Evas_Text *obj); +EVAS_API int evas_object_text_inset_get(const Evas_Text *obj); /** * @brief Maximal ascent property @@ -370,7 +370,7 @@ EAPI int evas_object_text_inset_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_max_ascent_get(const Evas_Text *obj); +EVAS_API int evas_object_text_max_ascent_get(const Evas_Text *obj); /** * @brief Vertical advance property @@ -381,7 +381,7 @@ EAPI int evas_object_text_max_ascent_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_vert_advance_get(const Evas_Text *obj); +EVAS_API int evas_object_text_vert_advance_get(const Evas_Text *obj); /** * @brief descent property @@ -392,7 +392,7 @@ EAPI int evas_object_text_vert_advance_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_descent_get(const Evas_Text *obj); +EVAS_API int evas_object_text_descent_get(const Evas_Text *obj); /** * @brief Returns the logical position of the last char in the text up to the @@ -409,7 +409,7 @@ EAPI int evas_object_text_descent_get(const Evas_Text *obj); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_last_up_to_pos(const Evas_Text *obj, int x, int y); +EVAS_API int evas_object_text_last_up_to_pos(const Evas_Text *obj, int x, int y); /** * @brief Get character coordinates @@ -426,7 +426,7 @@ EAPI int evas_object_text_last_up_to_pos(const Evas_Text *obj, int x, int y); * * @ingroup Evas_Object_Text_Group */ -EAPI int evas_object_text_char_coords_get(const Evas_Text *obj, int x, int y, int *cx, int *cy, int *cw, int *ch); +EVAS_API int evas_object_text_char_coords_get(const Evas_Text *obj, int x, int y, int *cx, int *cy, int *cw, int *ch); /** * @brief Retrieve position and dimension information of a character within a @@ -450,6 +450,6 @@ EAPI int evas_object_text_char_coords_get(const Evas_Text *obj, int x, int y, in * * @ingroup Evas_Object_Text_Group */ -EAPI Eina_Bool evas_object_text_char_pos_get(const Evas_Text *obj, int pos, int *cx, int *cy, int *cw, int *ch); +EVAS_API Eina_Bool evas_object_text_char_pos_get(const Evas_Text *obj, int pos, int *cx, int *cy, int *cw, int *ch); #endif diff --git a/src/lib/evas/canvas/evas_textblock_legacy.h b/src/lib/evas/canvas/evas_textblock_legacy.h index cafc14499c..b7905eec0d 100644 --- a/src/lib/evas/canvas/evas_textblock_legacy.h +++ b/src/lib/evas/canvas/evas_textblock_legacy.h @@ -195,7 +195,7 @@ typedef enum _Evas_Textblock_Cursor_Type * @param escape the string to be escaped * @return the unescaped version of escape */ -EAPI const char *evas_textblock_escape_string_get(const char *escape) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API const char *evas_textblock_escape_string_get(const char *escape) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Returns the escaped version of the string. @@ -203,7 +203,7 @@ EAPI const char *evas_textblock_escape_string_get(c * @param len_ret the len of the part of the string that was used. * @return the escaped string. */ -EAPI const char *evas_textblock_string_escape_get(const char *string, int *len_ret) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API const char *evas_textblock_string_escape_get(const char *string, int *len_ret) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Return the unescaped version of the string between start and end. @@ -212,19 +212,19 @@ EAPI const char *evas_textblock_string_escape_get(c * @param escape_end the end of the string. * @return the unescaped version of the range */ -EAPI const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); +EVAS_API const char *evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); /** * Creates a new textblock style. * @return The new textblock style. */ -EAPI Evas_Textblock_Style *evas_textblock_style_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC; +EVAS_API Evas_Textblock_Style *evas_textblock_style_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC; /** * Destroys a textblock style. * @param ts The textblock style to free. */ -EAPI void evas_textblock_style_free(Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1); +EVAS_API void evas_textblock_style_free(Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1); /** * Sets the style ts to the style passed as text by text. @@ -234,14 +234,14 @@ EAPI void evas_textblock_style_free(Evas_Tex * @param text the text to parse - NOT NULL. * @return Returns no value. */ -EAPI void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) EINA_ARG_NONNULL(1); +EVAS_API void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) EINA_ARG_NONNULL(1); /** * Return the text of the style ts. * @param ts the style to get it's text. * @return the text of the style or null on error. */ -EAPI const char *evas_textblock_style_get(const Evas_Textblock_Style *ts) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API const char *evas_textblock_style_get(const Evas_Textblock_Style *ts) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Returns the next format node (after n) @@ -249,7 +249,7 @@ EAPI const char *evas_textblock_style_get(const Eva * @param n the current format node - not null. * @return Returns the next format node, may be null. */ -EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1); /** * Returns the prev format node (after n) @@ -257,7 +257,7 @@ EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_ge * @param n the current format node - not null. * @return Returns the prev format node, may be null. */ -EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1); /** * Sets the cursor to point to the place where format points to. @@ -266,7 +266,7 @@ EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_ge * @param n the format node to update according. * @deprecated duplicate of evas_textblock_cursor_at_format_set */ -EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); /** * Return the format node at the position pointed by cur. @@ -275,7 +275,7 @@ EAPI void evas_textblock_cursor_set_at_forma * @return the format node if found, @c NULL otherwise. * @see evas_textblock_cursor_format_is_visible_get() */ -EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); /** * Get the text format representation of the format node. @@ -283,7 +283,7 @@ EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(c * @param fnode the format node. * @return the textual format of the format node. */ -EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fnode) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Set the cursor to point to the position of fmt. @@ -291,7 +291,7 @@ EAPI const char *evas_textblock_node_format_text_ge * @param cur the cursor to update * @param fmt the format to update according to. */ -EAPI void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt) EINA_ARG_NONNULL(1, 2); /** * Check if the current cursor position is a visible format. This way is more @@ -303,7 +303,7 @@ EAPI void evas_textblock_cursor_at_format_se * otherwise. * @see evas_textblock_cursor_format_get() */ -EAPI Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Advances to the next format node @@ -311,7 +311,7 @@ EAPI Eina_Bool evas_textblock_cursor_format_is_vi * @param cur the cursor to be updated. * @return @c EINA_TRUE on success @c EINA_FALSE otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); /** * Advances to the previous format node. @@ -319,7 +319,7 @@ EAPI Eina_Bool evas_textblock_cursor_format_next( * @param cur the cursor to update. * @return @c EINA_TRUE on success @c EINA_FALSE otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); /** * Returns true if the cursor points to a format. @@ -328,7 +328,7 @@ EAPI Eina_Bool evas_textblock_cursor_format_prev( * @return @c EINA_TRUE if a cursor points to a format @c EINA_FALSE * otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1); /** * Return the current cursor pos. @@ -336,7 +336,7 @@ EAPI Eina_Bool evas_textblock_cursor_is_format(co * @param cur the cursor to take the position from. * @return the position or -1 on error */ -EAPI int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Go to the start of the line passed @@ -345,7 +345,7 @@ EAPI int evas_textblock_cursor_pos_get(cons * @param line number to set. * @return @c EINA_TRUE on success, @c EINA_FALSE on error. */ -EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) EINA_ARG_NONNULL(1); /** * Adds format to the current cursor position. If the format being added is a @@ -370,7 +370,7 @@ EAPI Eina_Bool evas_textblock_cursor_line_set(Eva * @param cur the cursor to look at. * @return @c EINA_TRUE if the cursor points to the terminating null, @c EINA_FALSE otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format) EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_Bool evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format) EINA_ARG_NONNULL(1, 2); /** * Adds format to the current cursor position. If the format being added is a @@ -387,7 +387,7 @@ EAPI Eina_Bool evas_textblock_cursor_format_appen * @return Returns true if a visible format was added, false otherwise. * @see evas_textblock_cursor_format_prepend() */ -EAPI Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format) EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_Bool evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format) EINA_ARG_NONNULL(1, 2); /** * Delete the range between cur1 and cur2. @@ -396,7 +396,7 @@ EAPI Eina_Bool evas_textblock_cursor_format_prepe * @param cur2 the second side of the range * @return Returns no value. */ -EAPI void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2) EINA_ARG_NONNULL(1, 2); /** * Return the text of the paragraph cur points to - returns the text in markup. @@ -404,7 +404,7 @@ EAPI void evas_textblock_cursor_range_delete * @param cur the cursor pointing to the paragraph. * @return the text on success, @c NULL otherwise. */ -EAPI const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API const char *evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Return the length of the paragraph, cheaper the eina_unicode_strlen() @@ -412,7 +412,7 @@ EAPI const char *evas_textblock_cursor_paragraph_te * @param cur the position of the paragraph. * @return the length of the paragraph on success, -1 otehrwise. */ -EAPI int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Return the currently visible range. @@ -422,7 +422,7 @@ EAPI int evas_textblock_cursor_paragraph_te * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise. * @since 1.1 */ -EAPI Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end) EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_Bool evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end) EINA_ARG_NONNULL(1, 2); /** * Return the format nodes in the range between cur1 and cur2. @@ -432,7 +432,7 @@ EAPI Eina_Bool evas_textblock_cursor_visible_rang * @return the foramt nodes in the range. You have to free it. * @since 1.1 */ -EAPI Eina_List *evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_List *evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); /** * Return the text in the range between cur1 and cur2 @@ -443,7 +443,7 @@ EAPI Eina_List *evas_textblock_cursor_range_format * @return the text in the range * @see elm_entry_markup_to_utf8() */ -EAPI char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); +EVAS_API char *evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); /** * Return the content of the cursor. @@ -453,7 +453,7 @@ EAPI char *evas_textblock_cursor_range_text_g * @param cur the cursor * @return the text in the range, terminated by a nul byte (may be utf8). */ -EAPI char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; +EVAS_API char *evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; /** * Returns the geometry of two cursors ("split cursor"), if logical cursor is @@ -478,7 +478,7 @@ EAPI char *evas_textblock_cursor_content_get( * @return @c EINA_TRUE for split cursor, @c EINA_FALSE otherwise * @since 1.8 */ -EAPI Eina_Bool +EVAS_API Eina_Bool evas_textblock_cursor_geometry_bidi_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype); /** @@ -503,7 +503,7 @@ evas_textblock_cursor_geometry_bidi_get(const Evas_Textblock_Cursor *cur, Evas_C * @param ctype the type of the cursor. * @return line number of the char on success, -1 on error. */ -EAPI int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype) EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype) EINA_ARG_NONNULL(1); /** * Returns the geometry of the char at cur. @@ -515,7 +515,7 @@ EAPI int evas_textblock_cursor_geometry_get * @param ch the h of the char. * @return line number of the char on success, -1 on error. */ -EAPI int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); /** * Returns the geometry of the pen at cur. @@ -527,7 +527,7 @@ EAPI int evas_textblock_cursor_char_geometr * @param ch the h of the char. * @return line number of the char on success, -1 on error. */ -EAPI int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch) EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cpen_x, Evas_Coord *cy, Evas_Coord *cadv, Evas_Coord *ch) EINA_ARG_NONNULL(1); /** * Returns the geometry of the line at cur. @@ -539,7 +539,7 @@ EAPI int evas_textblock_cursor_pen_geometry * @param ch the height of the line. * @return line number of the line on success, -1 on error. */ -EAPI int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); /** * Set the cursor position according to the y coord. @@ -548,7 +548,7 @@ EAPI int evas_textblock_cursor_line_geometr * @param y the coord to set by. * @return the line number found, -1 on error. */ -EAPI int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) EINA_ARG_NONNULL(1); +EVAS_API int evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) EINA_ARG_NONNULL(1); /** * Get the geometry of a range. @@ -557,7 +557,7 @@ EAPI int evas_textblock_cursor_line_coord_s * @param cur2 other side of the range. * @return a list of Rectangles representing the geometry of the range. */ -EAPI Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_List *evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); /** * Get the simple geometry of a range. @@ -569,11 +569,11 @@ EAPI Eina_List *evas_textblock_cursor_range_geomet * @param cur2 other side of the range. * @return an iterator of rectangles representing the geometry of the range. */ -EAPI Eina_Iterator *evas_textblock_cursor_range_simple_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); +EVAS_API Eina_Iterator *evas_textblock_cursor_range_simple_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2); /** */ -EAPI Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); /** * Checks if the cursor points to the end of the line. @@ -581,14 +581,14 @@ EAPI Eina_Bool evas_textblock_cursor_format_item_ * @param cur the cursor to check. * @return @c EINA_TRUE if true, @c EINA_FALSE otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * @brief Advances the cursor one char backwards. * * @return @c true on success, @c false otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj); /** * @brief Advances the cursor one char forward. @@ -597,14 +597,14 @@ EAPI Eina_Bool evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_char_next(Evas_Textblock_Cursor *obj); /** * @brief Advances the cursor one grapheme cluster backwards. * * @return @c true on success, @c false otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_cluster_prev(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_cluster_prev(Evas_Textblock_Cursor *obj); /** * @brief Advances the cursor one grapheme cluster forward. @@ -613,7 +613,7 @@ EAPI Eina_Bool evas_textblock_cursor_cluster_prev(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_cluster_next(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_cluster_next(Evas_Textblock_Cursor *obj); /** * @brief Advances to the start of the next text node @@ -622,7 +622,7 @@ EAPI Eina_Bool evas_textblock_cursor_cluster_next(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *obj); /** * @brief Advances to the end of the previous text node @@ -631,7 +631,7 @@ EAPI Eina_Bool evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *obj); /** * @brief Moves the cursor to the start of the word under the cursor @@ -640,7 +640,7 @@ EAPI Eina_Bool evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *obj); /** * @brief Moves the cursor to the end of the word under the cursor @@ -649,7 +649,7 @@ EAPI Eina_Bool evas_textblock_cursor_word_start(Evas_Textblock_Cursor *obj); * * @ingroup Evas_Textblock_Cursor */ -EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *obj); +EVAS_API Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *obj); /** * @} @@ -666,7 +666,7 @@ EAPI Eina_Bool evas_textblock_cursor_word_end(Evas_Textblock_Cursor *obj); * @param e The given evas. * @return The new textblock object. */ -EAPI Evas_Object *evas_object_textblock_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; +EVAS_API Evas_Object *evas_object_textblock_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; /** * Return the plain version of the markup. @@ -681,7 +681,7 @@ EAPI Evas_Object *evas_object_textblock_add(Evas *e) * @return An allocated plain text version of the markup. * @since 1.2 */ -EAPI char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC; +EVAS_API char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC; /** * Return the markup version of the plain text. @@ -695,7 +695,7 @@ EAPI char *evas_textblock_text_markup_to_utf8 * @return An allocated markup version of the plain text. * @since 1.2 */ -EAPI char *evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC; +EVAS_API char *evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC; /** * Clear the textblock object. @@ -704,7 +704,7 @@ EAPI char *evas_textblock_text_utf8_to_markup * @param obj the object to clear. * @return nothing. */ -EAPI void evas_object_textblock_clear(Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API void evas_object_textblock_clear(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Sets given text as markup for the textblock object. @@ -715,7 +715,7 @@ EAPI void evas_object_textblock_clear(Evas_O * @param text the markup text to set. * @return Returns no value. */ -EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); +EVAS_API void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text) EINA_ARG_NONNULL(1); /** * Gets the current markup text of the textblock object. @@ -723,7 +723,7 @@ EAPI void evas_object_textblock_text_markup_set(Evas_Object *obj, const char *te * @param obj the textblock object. * @return Returns the current markup text. */ -EAPI const char *evas_object_textblock_text_markup_get(Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API const char *evas_object_textblock_text_markup_get(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Prepends markup to the cursor cur. @@ -734,7 +734,7 @@ EAPI const char *evas_object_textblock_text_markup_get(Evas_Object *obj) EINA_AR * @param text the markup text to prepend. * @return Return no value. */ -EAPI void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); /** * Sets object's style to given style. @@ -744,7 +744,7 @@ EAPI void evas_object_textblock_text_markup_ * @return Returns no value. * @see evas_textblock_style_user_push() */ -EAPI void evas_object_textblock_style_set(Evas_Object *obj, const Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_object_textblock_style_set(Evas_Object *obj, const Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1, 2); /** * Gets the object's current style. @@ -753,7 +753,7 @@ EAPI void evas_object_textblock_style_set(Ev * @return Returns the current active style. * @see evas_textblock_style_user_peek() */ -EAPI Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API Evas_Textblock_Style *evas_object_textblock_style_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** @@ -771,7 +771,7 @@ EAPI Evas_Textblock_Style *evas_object_textblock_style_get(c * * @since 1.2 */ -EAPI void evas_object_textblock_style_user_push(Evas_Object *obj, Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1,2); +EVAS_API void evas_object_textblock_style_user_push(Evas_Object *obj, Evas_Textblock_Style *ts) EINA_ARG_NONNULL(1,2); /** * Peeks at the user-styles stack @@ -780,7 +780,7 @@ EAPI void evas_object_textblock_style_user_ * @return Returns the user style at the top of the user style stack. * @see evas_textblock_style_user_pop() */ -EAPI const Evas_Textblock_Style *evas_object_textblock_style_user_peek(const Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Textblock_Style *evas_object_textblock_style_user_peek(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Removes the style at the top of the user-style stack @@ -789,7 +789,7 @@ EAPI const Evas_Textblock_Style *evas_object_textblock_style_user_ * @return Returns no value. * @see evas_textblock_style_user_peek() */ -EAPI void evas_object_textblock_style_user_pop(Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API void evas_object_textblock_style_user_pop(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Gets the first format node @@ -797,7 +797,7 @@ EAPI void evas_object_textblock_style_user_p * @param obj The textblock object. * @return Returns the first format node. */ -EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_first_get(Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_first_get(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Gets the last format node @@ -805,7 +805,7 @@ EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_first_g * @param obj The textblock object. * @return Returns the first format node. */ -EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_last_get(Evas_Object *obj) EINA_ARG_NONNULL(1); +EVAS_API const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_last_get(Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Gets a list of format nodes that match given format. @@ -814,7 +814,7 @@ EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_last_ge * @param anchor The format to find in the textblock. * @return Returns a list of format nodes that match the given format. */ -EAPI const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor) EINA_ARG_NONNULL(1); +EVAS_API const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor) EINA_ARG_NONNULL(1); /** * Removes format node and its matching format node. @@ -823,7 +823,7 @@ EAPI const Eina_List *evas_textblock_node_format_list_get(const Evas_Object *obj * @param n The format node to remove. * @return Returns no value. */ -EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); +EVAS_API void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2); /** * Gets the geometry of the line specified by its number. @@ -832,7 +832,7 @@ EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_T * @param line the line number of the queried line. * @return Returns no value. */ -EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); +EVAS_API Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) EINA_ARG_NONNULL(1); /** * Make cur_dest point to the same place as cur. Does not work if they don't @@ -842,7 +842,7 @@ EAPI Eina_Bool evas_object_textblock_line_number_geometry_get(const Evas_Object * @param cur_dest destination cursor. * @return Returns no value. */ -EAPI void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest); +EVAS_API void evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest); /** * Create a new cursor, associate it to the obj and init it to point @@ -859,7 +859,7 @@ EAPI void evas_textblock_cursor_copy(const E * @param obj The textblock to which the new cursor will associate. * @return Returns a new cursor associated with the given textblock object. */ -EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *obj); +EVAS_API Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object *obj); /** * @brief Sets the position of the cursor according to the X and Y coordinates. @@ -868,7 +868,7 @@ EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_new(const Evas_Object * * * @return @c true on success, @c false otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y); +EVAS_API Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y); /** * @brief Sets the position of the cursor according to the X and Y coordinates and @@ -878,7 +878,7 @@ EAPI Eina_Bool evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *obj, * * @return @c true on success, @c false otherwise. */ -EAPI Eina_Bool evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y); +EVAS_API Eina_Bool evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *obj, Evas_Coord x, Evas_Coord y); /** * Free the cursor and unassociate it from the object. @@ -887,7 +887,7 @@ EAPI Eina_Bool evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *ob * @param cur the cursor to free. * @return Returns no value. */ -EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur); /** * Adds text to the current cursor position and set the cursor to *before* @@ -898,7 +898,7 @@ EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur); * @return Returns the len of the text added. * @see evas_textblock_cursor_text_prepend() */ -EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); +EVAS_API int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); /** * Adds text to the current cursor position and set the cursor to *after* @@ -909,7 +909,7 @@ EAPI int evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const cha * @return Returns the len of the text added. * @see evas_textblock_cursor_text_append() */ -EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); +EVAS_API int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text) EINA_ARG_NONNULL(1, 2); /** * @brief The "replacement character" to use for the given textblock object. @@ -918,7 +918,7 @@ EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const ch * * @ingroup Efl_Canvas_Textblock */ -EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch); +EVAS_API void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch); /** * @brief The "replacement character" to use for the given textblock object. @@ -927,7 +927,7 @@ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *c * * @ingroup Efl_Canvas_Textblock */ -EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj); +EVAS_API const char *evas_object_textblock_replace_char_get(const Evas_Object *obj); /** * @brief The vertical alignment of text within the textblock object as a @@ -942,7 +942,7 @@ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj); * * @ingroup Efl_Canvas_Textblock */ -EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align); +EVAS_API void evas_object_textblock_valign_set(Evas_Object *obj, double align); /** * @brief The vertical alignment of text within the textblock object as a @@ -957,7 +957,7 @@ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align); * * @ingroup Efl_Canvas_Textblock */ -EAPI double evas_object_textblock_valign_get(const Evas_Object *obj); +EVAS_API double evas_object_textblock_valign_get(const Evas_Object *obj); /** * Sets the cursor to the start of the first text node. @@ -965,7 +965,7 @@ EAPI double evas_object_textblock_valign_get(const Evas_Object *obj); * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur); /** * sets the cursor to the end of the last text node. @@ -973,7 +973,7 @@ EAPI void evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur); * @param cur the cursor to set. * @return Returns no value. */ -EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur); /** * Compare two cursors. @@ -982,7 +982,7 @@ EAPI void evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur); * @param cur2 the second cursor. * @return -1 if cur1 < cur2, 0 if cur1 == cur2 and 1 otherwise. */ -EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2); +EVAS_API int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2); /** * @brief Checks if two cursors are equal @@ -996,7 +996,7 @@ EAPI int evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const * * @since 1.18 */ -EAPI Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *obj, const Evas_Textblock_Cursor *cur); +EVAS_API Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *obj, const Evas_Textblock_Cursor *cur); /** * Go to the start of the current line @@ -1004,7 +1004,7 @@ EAPI Eina_Bool evas_textblock_cursor_equal(const Evas_Textblock_Cursor *obj, con * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur); /** * Go to the end of the current line. @@ -1012,7 +1012,7 @@ EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur); * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur); /** * Set the cursor pos. @@ -1020,7 +1020,7 @@ EAPI void evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur); * @param cur the cursor to be set. * @param _pos the pos to set. */ -EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int _pos); +EVAS_API void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int _pos); /** * Go to the first char in the node the cursor is pointing on. @@ -1028,7 +1028,7 @@ EAPI void evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int _pos); * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur); /** * Go to the last char in a text node. @@ -1036,7 +1036,7 @@ EAPI void evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur) * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur); /** * Deletes a single character from position pointed by given cursor. @@ -1044,13 +1044,13 @@ EAPI void evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur); * @param cur the cursor to update. * @return Returns no value. */ -EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur); +EVAS_API void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur); /** Get the object's main cursor. * * @ingroup Evas_Textblock */ -EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj); +EVAS_API Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj); @@ -1074,7 +1074,7 @@ EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object * * @param[out] p_options content fitting options. * @return Returns error code. */ -EAPI int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int * p_options); +EVAS_API int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int * p_options); /** Set the object's content fit options. * @@ -1082,7 +1082,7 @@ EAPI int evas_textblock_fit_options_get(const Evas_Object *obj, unsigned int * * @param[in] options content fitting options. * @return Returns error code. */ -EAPI int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options); +EVAS_API int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options); /** Get the object's max and min font sizes used for fitting content. * @@ -1091,7 +1091,7 @@ EAPI int evas_textblock_fit_options_set(Evas_Object *obj, unsigned int options) * @param[out] p_max_font_size max font size used when fitting content. * @return Returns error code. */ -EAPI int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int *p_min_font_size, unsigned int *p_max_font_size); +EVAS_API int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int *p_min_font_size, unsigned int *p_max_font_size); /** Set the object's max and min font sizes used for fitting content. * @@ -1100,7 +1100,7 @@ EAPI int evas_textblock_fit_size_range_get(const Evas_Object *obj, unsigned int * @param[in] max_font_size max font size used when fitting content. * @return Returns error code. */ -EAPI int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_font_size, unsigned int max_font_size); +EVAS_API int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_font_size, unsigned int max_font_size); /** Get the object's fitting step size when trying fonts between min font size and @@ -1110,7 +1110,7 @@ EAPI int evas_textblock_fit_size_range_set(Evas_Object *obj, unsigned int min_f * @param[out] p_step_size step jumps between min and max font size. * @return Returns error code. */ -EAPI int evas_textblock_fit_step_size_get(const Evas_Object *obj, unsigned int *p_step_size); +EVAS_API int evas_textblock_fit_step_size_get(const Evas_Object *obj, unsigned int *p_step_size); /** Set the object's fitting step size when trying fonts between min font size and @@ -1120,7 +1120,7 @@ EAPI int evas_textblock_fit_step_size_get(const Evas_Object *obj, unsigned int * @param[out] step_size step jumps between min and max font size. * @return Returns error code. */ -EAPI int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_size); +EVAS_API int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_size); /** Get copy of the object's fitting font size array used internally * @@ -1130,7 +1130,7 @@ EAPI int evas_textblock_fit_step_size_set(Evas_Object *obj, unsigned int step_s * @param[out] request_size_array request to fill specific amount in p_size_array. * @return Returns error code. */ -EAPI int evas_textblock_fit_size_array_get(const Evas_Object *obj, unsigned int *p_size_array, size_t *p_size_array_len,size_t request_size_array); +EVAS_API int evas_textblock_fit_size_array_get(const Evas_Object *obj, unsigned int *p_size_array, size_t *p_size_array_len,size_t request_size_array); /** Set the object's fitting font size array that will be used internally * Changing fitting step_size,min_font_size,max_font size will generate new array @@ -1141,7 +1141,7 @@ EAPI int evas_textblock_fit_size_array_get(const Evas_Object *obj, unsigned int * @param[in] size_array_len the length passed font sizes array. * @return Returns error code. */ -EAPI int evas_textblock_fit_size_array_set(Evas_Object *obj, const unsigned int *p_size_array, size_t size_array_len); +EVAS_API int evas_textblock_fit_size_array_set(Evas_Object *obj, const unsigned int *p_size_array, size_t size_array_len); diff --git a/src/lib/evas/canvas/evas_textgrid_eo.c b/src/lib/evas/canvas/evas_textgrid_eo.c index bbe4614766..1522cba0f1 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.c +++ b/src/lib/evas/canvas/evas_textgrid_eo.c @@ -1,43 +1,43 @@ void _evas_textgrid_supported_font_styles_set(Eo *obj, Evas_Textgrid_Data *pd, Evas_Textgrid_Font_Style styles); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_textgrid_supported_font_styles_set, EFL_FUNC_CALL(styles), Evas_Textgrid_Font_Style styles); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_textgrid_supported_font_styles_set, EFL_FUNC_CALL(styles), Evas_Textgrid_Font_Style styles); Evas_Textgrid_Font_Style _evas_textgrid_supported_font_styles_get(const Eo *obj, Evas_Textgrid_Data *pd); -EOAPI EFL_FUNC_BODY_CONST(evas_obj_textgrid_supported_font_styles_get, Evas_Textgrid_Font_Style, 0); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODY_CONST(evas_obj_textgrid_supported_font_styles_get, Evas_Textgrid_Font_Style, 0); void _evas_textgrid_grid_size_set(Eo *obj, Evas_Textgrid_Data *pd, int w, int h); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_textgrid_grid_size_set, EFL_FUNC_CALL(w, h), int w, int h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_textgrid_grid_size_set, EFL_FUNC_CALL(w, h), int w, int h); void _evas_textgrid_grid_size_get(const Eo *obj, Evas_Textgrid_Data *pd, int *w, int *h); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_grid_size_get, EFL_FUNC_CALL(w, h), int *w, int *h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_grid_size_get, EFL_FUNC_CALL(w, h), int *w, int *h); void _evas_textgrid_cell_size_get(const Eo *obj, Evas_Textgrid_Data *pd, int *width, int *height); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_cell_size_get, EFL_FUNC_CALL(width, height), int *width, int *height); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_cell_size_get, EFL_FUNC_CALL(width, height), int *width, int *height); void _evas_textgrid_update_add(Eo *obj, Evas_Textgrid_Data *pd, int x, int y, int w, int h); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_textgrid_update_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_textgrid_update_add, EFL_FUNC_CALL(x, y, w, h), int x, int y, int w, int h); void _evas_textgrid_cellrow_set(Eo *obj, Evas_Textgrid_Data *pd, int y, const Evas_Textgrid_Cell *row); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_textgrid_cellrow_set, EFL_FUNC_CALL(y, row), int y, const Evas_Textgrid_Cell *row); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_textgrid_cellrow_set, EFL_FUNC_CALL(y, row), int y, const Evas_Textgrid_Cell *row); Evas_Textgrid_Cell *_evas_textgrid_cellrow_get(const Eo *obj, Evas_Textgrid_Data *pd, int y); -EOAPI EFL_FUNC_BODYV_CONST(evas_obj_textgrid_cellrow_get, Evas_Textgrid_Cell *, NULL, EFL_FUNC_CALL(y), int y); +EVAS_API EVAS_API_WEAK EFL_FUNC_BODYV_CONST(evas_obj_textgrid_cellrow_get, Evas_Textgrid_Cell *, NULL, EFL_FUNC_CALL(y), int y); void _evas_textgrid_palette_set(Eo *obj, Evas_Textgrid_Data *pd, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); -EOAPI EFL_VOID_FUNC_BODYV(evas_obj_textgrid_palette_set, EFL_FUNC_CALL(pal, idx, r, g, b, a), Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV(evas_obj_textgrid_palette_set, EFL_FUNC_CALL(pal, idx, r, g, b, a), Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); void _evas_textgrid_palette_get(const Eo *obj, Evas_Textgrid_Data *pd, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); -EOAPI EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_palette_get, EFL_FUNC_CALL(pal, idx, r, g, b, a), Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK EFL_VOID_FUNC_BODYV_CONST(evas_obj_textgrid_palette_get, EFL_FUNC_CALL(pal, idx, r, g, b, a), Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); Efl_Object *_evas_textgrid_efl_object_constructor(Eo *obj, Evas_Textgrid_Data *pd); diff --git a/src/lib/evas/canvas/evas_textgrid_eo.h b/src/lib/evas/canvas/evas_textgrid_eo.h index 59bd2f3a0d..1635f26230 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.h +++ b/src/lib/evas/canvas/evas_textgrid_eo.h @@ -53,7 +53,7 @@ typedef struct _Evas_Textgrid_Cell Evas_Textgrid_Cell; */ #define EVAS_TEXTGRID_CLASS evas_textgrid_class_get() -EWAPI const Efl_Class *evas_textgrid_class_get(void) EINA_CONST; +EVAS_API EVAS_API_WEAK const Efl_Class *evas_textgrid_class_get(void) EINA_CONST; /** * @brief This function is not implemented yet, do not use. @@ -63,7 +63,7 @@ EWAPI const Efl_Class *evas_textgrid_class_get(void) EINA_CONST; * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_supported_font_styles_set(Eo *obj, Evas_Textgrid_Font_Style styles); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_supported_font_styles_set(Eo *obj, Evas_Textgrid_Font_Style styles); /** * @brief This function is not implemented yet, do not use. @@ -74,7 +74,7 @@ EOAPI void evas_obj_textgrid_supported_font_styles_set(Eo *obj, Evas_Textgrid_Fo * * @ingroup Evas_Textgrid */ -EOAPI Evas_Textgrid_Font_Style evas_obj_textgrid_supported_font_styles_get(const Eo *obj); +EVAS_API EVAS_API_WEAK Evas_Textgrid_Font_Style evas_obj_textgrid_supported_font_styles_get(const Eo *obj); /** * @brief Set the size of the textgrid object. @@ -91,7 +91,7 @@ EOAPI Evas_Textgrid_Font_Style evas_obj_textgrid_supported_font_styles_get(const * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_grid_size_set(Eo *obj, int w, int h); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_grid_size_set(Eo *obj, int w, int h); /** * @brief Get the size of the textgrid object. @@ -108,7 +108,7 @@ EOAPI void evas_obj_textgrid_grid_size_set(Eo *obj, int w, int h); * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_grid_size_get(const Eo *obj, int *w, int *h); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_grid_size_get(const Eo *obj, int *w, int *h); /** * @brief Retrieve the size of a cell of the given textgrid object in pixels. @@ -132,7 +132,7 @@ EOAPI void evas_obj_textgrid_grid_size_get(const Eo *obj, int *w, int *h); * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_cell_size_get(const Eo *obj, int *width, int *height); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_cell_size_get(const Eo *obj, int *width, int *height); /** * @brief Indicate for evas that part of a textgrid region (cells) has been @@ -155,7 +155,7 @@ EOAPI void evas_obj_textgrid_cell_size_get(const Eo *obj, int *width, int *heigh * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_update_add(Eo *obj, int x, int y, int w, int h); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_update_add(Eo *obj, int x, int y, int w, int h); /** * @brief Set the string at the given row of the given textgrid object. @@ -176,7 +176,7 @@ EOAPI void evas_obj_textgrid_update_add(Eo *obj, int x, int y, int w, int h); * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_cellrow_set(Eo *obj, int y, const Evas_Textgrid_Cell *row); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_cellrow_set(Eo *obj, int y, const Evas_Textgrid_Cell *row); /** * @brief Get the string at the given row of the given textgrid object. @@ -197,7 +197,7 @@ EOAPI void evas_obj_textgrid_cellrow_set(Eo *obj, int y, const Evas_Textgrid_Cel * * @ingroup Evas_Textgrid */ -EOAPI Evas_Textgrid_Cell *evas_obj_textgrid_cellrow_get(const Eo *obj, int y); +EVAS_API EVAS_API_WEAK Evas_Textgrid_Cell *evas_obj_textgrid_cellrow_get(const Eo *obj, int y); /** * @brief The set color to the given palette at the given index of the given @@ -227,7 +227,7 @@ EOAPI Evas_Textgrid_Cell *evas_obj_textgrid_cellrow_get(const Eo *obj, int y); * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_palette_set(Eo *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_palette_set(Eo *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); /** * @brief The retrieve color to the given palette at the given index of the @@ -254,6 +254,6 @@ EOAPI void evas_obj_textgrid_palette_set(Eo *obj, Evas_Textgrid_Palette pal, int * * @ingroup Evas_Textgrid */ -EOAPI void evas_obj_textgrid_palette_get(const Eo *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); +EVAS_API EVAS_API_WEAK void evas_obj_textgrid_palette_get(const Eo *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); #endif diff --git a/src/lib/evas/canvas/evas_textgrid_eo.legacy.c b/src/lib/evas/canvas/evas_textgrid_eo.legacy.c index 8110d09e65..fea39c8d88 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.legacy.c +++ b/src/lib/evas/canvas/evas_textgrid_eo.legacy.c @@ -1,59 +1,59 @@ -EAPI void +EVAS_API void evas_object_textgrid_supported_font_styles_set(Evas_Textgrid *obj, Evas_Textgrid_Font_Style styles) { evas_obj_textgrid_supported_font_styles_set(obj, styles); } -EAPI Evas_Textgrid_Font_Style +EVAS_API Evas_Textgrid_Font_Style evas_object_textgrid_supported_font_styles_get(const Evas_Textgrid *obj) { return evas_obj_textgrid_supported_font_styles_get(obj); } -EAPI void +EVAS_API void evas_object_textgrid_size_set(Evas_Textgrid *obj, int w, int h) { evas_obj_textgrid_grid_size_set(obj, w, h); } -EAPI void +EVAS_API void evas_object_textgrid_size_get(const Evas_Textgrid *obj, int *w, int *h) { evas_obj_textgrid_grid_size_get(obj, w, h); } -EAPI void +EVAS_API void evas_object_textgrid_cell_size_get(const Evas_Textgrid *obj, int *width, int *height) { evas_obj_textgrid_cell_size_get(obj, width, height); } -EAPI void +EVAS_API void evas_object_textgrid_update_add(Evas_Textgrid *obj, int x, int y, int w, int h) { evas_obj_textgrid_update_add(obj, x, y, w, h); } -EAPI void +EVAS_API void evas_object_textgrid_cellrow_set(Evas_Textgrid *obj, int y, const Evas_Textgrid_Cell *row) { evas_obj_textgrid_cellrow_set(obj, y, row); } -EAPI Evas_Textgrid_Cell * +EVAS_API Evas_Textgrid_Cell * evas_object_textgrid_cellrow_get(const Evas_Textgrid *obj, int y) { return evas_obj_textgrid_cellrow_get(obj, y); } -EAPI void +EVAS_API void evas_object_textgrid_palette_set(Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a) { evas_obj_textgrid_palette_set(obj, pal, idx, r, g, b, a); } -EAPI void +EVAS_API void evas_object_textgrid_palette_get(const Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a) { evas_obj_textgrid_palette_get(obj, pal, idx, r, g, b, a); diff --git a/src/lib/evas/canvas/evas_textgrid_eo.legacy.h b/src/lib/evas/canvas/evas_textgrid_eo.legacy.h index 379747e095..4cc8d6f59d 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.legacy.h +++ b/src/lib/evas/canvas/evas_textgrid_eo.legacy.h @@ -56,7 +56,7 @@ typedef struct _Evas_Textgrid_Cell Evas_Textgrid_Cell; * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_supported_font_styles_set(Evas_Textgrid *obj, Evas_Textgrid_Font_Style styles); +EVAS_API void evas_object_textgrid_supported_font_styles_set(Evas_Textgrid *obj, Evas_Textgrid_Font_Style styles); /** * @brief This function is not implemented yet, do not use. @@ -67,7 +67,7 @@ EAPI void evas_object_textgrid_supported_font_styles_set(Evas_Textgrid *obj, Eva * * @ingroup Evas_Object_Textgrid_Group */ -EAPI Evas_Textgrid_Font_Style evas_object_textgrid_supported_font_styles_get(const Evas_Textgrid *obj); +EVAS_API Evas_Textgrid_Font_Style evas_object_textgrid_supported_font_styles_get(const Evas_Textgrid *obj); /** * @brief Set the size of the textgrid object. @@ -84,7 +84,7 @@ EAPI Evas_Textgrid_Font_Style evas_object_textgrid_supported_font_styles_get(con * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_size_set(Evas_Textgrid *obj, int w, int h); +EVAS_API void evas_object_textgrid_size_set(Evas_Textgrid *obj, int w, int h); /** * @brief Get the size of the textgrid object. @@ -101,7 +101,7 @@ EAPI void evas_object_textgrid_size_set(Evas_Textgrid *obj, int w, int h); * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_size_get(const Evas_Textgrid *obj, int *w, int *h); +EVAS_API void evas_object_textgrid_size_get(const Evas_Textgrid *obj, int *w, int *h); /** * @brief Retrieve the size of a cell of the given textgrid object in pixels. @@ -125,7 +125,7 @@ EAPI void evas_object_textgrid_size_get(const Evas_Textgrid *obj, int *w, int *h * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_cell_size_get(const Evas_Textgrid *obj, int *width, int *height); +EVAS_API void evas_object_textgrid_cell_size_get(const Evas_Textgrid *obj, int *width, int *height); /** * @brief Indicate for evas that part of a textgrid region (cells) has been @@ -148,7 +148,7 @@ EAPI void evas_object_textgrid_cell_size_get(const Evas_Textgrid *obj, int *widt * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_update_add(Evas_Textgrid *obj, int x, int y, int w, int h); +EVAS_API void evas_object_textgrid_update_add(Evas_Textgrid *obj, int x, int y, int w, int h); /** * @brief Set the string at the given row of the given textgrid object. @@ -169,7 +169,7 @@ EAPI void evas_object_textgrid_update_add(Evas_Textgrid *obj, int x, int y, int * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_cellrow_set(Evas_Textgrid *obj, int y, const Evas_Textgrid_Cell *row); +EVAS_API void evas_object_textgrid_cellrow_set(Evas_Textgrid *obj, int y, const Evas_Textgrid_Cell *row); /** * @brief Get the string at the given row of the given textgrid object. @@ -190,7 +190,7 @@ EAPI void evas_object_textgrid_cellrow_set(Evas_Textgrid *obj, int y, const Evas * * @ingroup Evas_Object_Textgrid_Group */ -EAPI Evas_Textgrid_Cell *evas_object_textgrid_cellrow_get(const Evas_Textgrid *obj, int y); +EVAS_API Evas_Textgrid_Cell *evas_object_textgrid_cellrow_get(const Evas_Textgrid *obj, int y); /** * @brief The set color to the given palette at the given index of the given @@ -220,7 +220,7 @@ EAPI Evas_Textgrid_Cell *evas_object_textgrid_cellrow_get(const Evas_Textgrid *o * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_palette_set(Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); +EVAS_API void evas_object_textgrid_palette_set(Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int r, int g, int b, int a); /** * @brief The retrieve color to the given palette at the given index of the @@ -247,6 +247,6 @@ EAPI void evas_object_textgrid_palette_set(Evas_Textgrid *obj, Evas_Textgrid_Pal * * @ingroup Evas_Object_Textgrid_Group */ -EAPI void evas_object_textgrid_palette_get(const Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); +EVAS_API void evas_object_textgrid_palette_get(const Evas_Textgrid *obj, Evas_Textgrid_Palette pal, int idx, int *r, int *g, int *b, int *a); #endif diff --git a/src/lib/evas/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c index c266675a44..b2e866802a 100644 --- a/src/lib/evas/canvas/evas_touch_point.c +++ b/src/lib/evas/canvas/evas_touch_point.c @@ -53,7 +53,7 @@ _evas_touch_point_remove(Evas *eo_e, int id) } } -EAPI unsigned int +EVAS_API unsigned int evas_touch_point_list_count(Eo *eo_e) { EVAS_LEGACY_API(eo_e, e, 0); @@ -79,7 +79,7 @@ _evas_canvas_touch_point_list_nth_xy_get(Evas_Canvas *eo_e EINA_UNUSED, if (y) *y = point->y; } -EAPI void +EVAS_API void evas_touch_point_list_nth_xy_get(Evas *eo_e, unsigned int n, Evas_Coord *x, Evas_Coord *y) { @@ -91,7 +91,7 @@ evas_touch_point_list_nth_xy_get(Evas *eo_e, unsigned int n, if (y) *y = Y; } -EAPI int +EVAS_API int evas_touch_point_list_nth_id_get(Evas *eo_e, unsigned int n) { Evas_Coord_Touch_Point *point; @@ -102,7 +102,7 @@ evas_touch_point_list_nth_id_get(Evas *eo_e, unsigned int n) else return point->id; } -EAPI Evas_Touch_Point_State +EVAS_API Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *eo_e, unsigned int n) { Evas_Coord_Touch_Point *point; diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build index db23590ba3..09320e690d 100644 --- a/src/lib/evas/canvas/meson.build +++ b/src/lib/evas/canvas/meson.build @@ -62,6 +62,7 @@ foreach eo_file : priv_eo_files '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EVAS_API', '-gchd', '@INPUT@']) endforeach @@ -80,6 +81,7 @@ foreach eo_file : pub_eo_files '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EVAS_API', '-gchd', '@INPUT@']) endforeach @@ -101,6 +103,7 @@ foreach eo_file : pub_eo_types_files command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), + '-e', 'EVAS_API', '-ghd', '@INPUT@']) endforeach |