summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 19:39:19 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 20:53:20 +0900
commit1d62f9dc7c67b9cc9fb6ce128576b87f6e81d9d4 (patch)
tree0a6618e20bda9eae4267edfdeec8229316e38946
parent8a20251795317a948f5e72d8fcd996b1e5983984 (diff)
downloadefl-1d62f9dc7c67b9cc9fb6ce128576b87f6e81d9d4.tar.gz
widget: Remove some more functions from EO
Internals... Ref T5363
-rw-r--r--src/lib/elementary/elm_widget.c15
-rw-r--r--src/lib/elementary/elm_widget.eo14
2 files changed, 11 insertions, 18 deletions
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 26b676f708..962bff97be 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1732,9 +1732,12 @@ _elm_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
return sd->can_focus;
}
-EOLIAN static Eina_Bool
-_elm_widget_child_can_focus_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
+EAPI Eina_Bool
+elm_widget_child_can_focus_get(const Eo *obj)
{
+ Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
+ if (!sd) return EINA_FALSE;
+
return sd->child_can_focus;
}
@@ -3128,9 +3131,13 @@ _elm_widget_focus_next_item_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
sd->item_focus_left = next_item;
}
-EOLIAN static void
-_elm_widget_parent_highlight_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool highlighted)
+/** @internal */
+EAPI void
+elm_widget_parent_highlight_set(Eo *obj, Eina_Bool highlighted)
{
+ Elm_Widget_Smart_Data *sd =efl_data_scope_safe_get(obj, MY_CLASS);
+ if (!sd) return;
+
highlighted = !!highlighted;
Evas_Object *o = elm_widget_parent_get(obj);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index ed2b337445..5154ec44f8 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -291,14 +291,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
mode: Elm.Focus.Region.Show_Mode; [[Focus region show mode]]
}
}
- @property parent_highlight {
- [[Parent highlight property]]
- set {
- }
- values {
- highlighted: bool; [[$true if highlighted, $false otherwise]]
- }
- }
@property theme_object {
[[Theme object property]]
set {
@@ -358,12 +350,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
enable: bool; [[$true if item loop is enabled, $false otherwise]]
}
}
- @property child_can_focus {
- [[Child can focus property]]
- get {
- return: bool; [[$true if child can focus, $false otherwise]]
- }
- }
@property scroll_freeze {
[[Scroll freeze property]]
get {