summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-07-25 17:23:37 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2016-07-25 18:01:37 +0200
commita17d59c7c334a91a70dd697ba014ed35000503f5 (patch)
treecf935c7c23e39d1db24e3a78a5e1fc05d9d4d682
parent864ea76a2db320a072aba3153e003fe820e9b5e9 (diff)
Revert "access: add API to get access object of given part"
This reverts commit 57d77c9041086ebbf84c2a30d93e95d47fc12705. We are in freeze right now and this is a new feature. Considering the access API is still in beta I might have let this slip by but its does not even build ../../../src/tests/elementary/elm_test_popup.c:27:1: error: conflicting types for ‘elm_object_part_access_object_get’ START_TEST (elm_object_part_access_object_get) ^ In file included from ../../../src/lib/elementary/Elementary.h:240:0, from ../../../src/tests/elementary/elm_test_popup.c:6: ../../../src/lib/elementary/elm_object.h:521:54: note: previous declaration of ‘elm_object_part_access_object_get’ was here EAPI Evas_Object *elm_object_part_access_object_get(const Evas_Object *obj, const char *part); ^ ../../../src/tests/elementary/elm_test_popup.c: In function ‘elm_object_part_access_object_get’: ../../../src/tests/elementary/elm_test_popup.c:39:47: warning: passing argument 1 of ‘elm_object_part_access_object_get’ makes integer from pointer without a cast [-Wint-conversion] access = elm_object_part_access_object_get(popup, "access.title"); ^ ../../../src/tests/elementary/elm_test_popup.c:27:1: note: expected ‘int’ but argument is of type ‘Evas_Object * {aka struct _Eo_Opaque *}’ START_TEST (elm_object_part_access_object_get) ^ ../../../src/tests/elementary/elm_test_popup.c:39:13: error: too many arguments to function ‘elm_object_part_access_object_get’ access = elm_object_part_access_object_get(popup, "access.title"); ^ ../../../src/tests/elementary/elm_test_popup.c:27:1: note: declared here START_TEST (elm_object_part_access_object_get) ^ ../../../src/tests/elementary/elm_test_popup.c:39:11: error: void value not ignored as it ought to be access = elm_object_part_access_object_get(popup, "access.title"); ^ Makefile:43996: recipe for target 'tests/elementary/tests_elementary_elm_suite-elm_test_popup.o' failed make[5]: *** [tests/elementary/tests_elementary_elm_suite-elm_test_popup.o] Error 1 If you still want this in make sure it actually can compile the tests you added.
-rw-r--r--NEWS1
-rw-r--r--src/lib/elementary/elc_popup.c6
-rw-r--r--src/lib/elementary/elm_main.c7
-rw-r--r--src/lib/elementary/elm_object.h11
-rw-r--r--src/lib/elementary/elm_popup.eo1
-rw-r--r--src/lib/elementary/elm_widget.c8
-rw-r--r--src/lib/elementary/elm_widget.eo9
-rw-r--r--src/tests/elementary/elm_test_popup.c20
8 files changed, 0 insertions, 63 deletions
diff --git a/NEWS b/NEWS
index c539e32f43..9ea2b6977d 100644
--- a/NEWS
+++ b/NEWS
@@ -240,7 +240,6 @@ Features:
240 * eo base - add weak object refs as per jpeg needs 240 * eo base - add weak object refs as per jpeg needs
241 * elput: Add API function to return output name associated with input device 241 * elput: Add API function to return output name associated with input device
242 * Eo refcount: Split the refcount to private and public (user). 242 * Eo refcount: Split the refcount to private and public (user).
243 * access: Add API to get access object of given widget's part.
244 243
245Fixes: 244Fixes:
246 245
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 02c2745623..28836efc40 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1482,12 +1482,6 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
1482 return EINA_TRUE; 1482 return EINA_TRUE;
1483} 1483}
1484 1484
1485EOLIAN static Evas_Object*
1486_elm_popup_elm_widget_part_access_object_get(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part)
1487{
1488 return _access_object_get(obj, part);
1489}
1490
1491EOLIAN static void 1485EOLIAN static void
1492_elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv) 1486_elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
1493{ 1487{
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 41b110648c..5152394a79 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1924,10 +1924,3 @@ elm_object_focus_region_show_mode_get(const Evas_Object *obj)
1924{ 1924{
1925 return elm_widget_focus_region_show_mode_get(obj); 1925 return elm_widget_focus_region_show_mode_get(obj);
1926} 1926}
1927
1928EAPI Evas_Object *
1929elm_object_part_access_object_get(const Evas_Object *obj, const char *part)
1930{
1931 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
1932 return elm_widget_part_access_object_get(obj, part);
1933}
diff --git a/src/lib/elementary/elm_object.h b/src/lib/elementary/elm_object.h
index 00f9ee1b56..935e6a7eb9 100644
--- a/src/lib/elementary/elm_object.h
+++ b/src/lib/elementary/elm_object.h
@@ -508,14 +508,3 @@ EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina
508 */ 508 */
509EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj); 509EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj);
510 510
511/**
512 * Get the access object which is registered to part
513 *
514 * @param obj The Elementary widget
515 * @param part The widget's part name to get access object
516 *
517 * @since 1.18
518 *
519 * @ingroup General
520 */
521EAPI Evas_Object *elm_object_part_access_object_get(const Evas_Object *obj, const char *part);
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index db33569fac..93feda01d3 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -180,7 +180,6 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Edje.Object)
180 Elm.Widget.translate; 180 Elm.Widget.translate;
181 Elm.Widget.sub_object_del; 181 Elm.Widget.sub_object_del;
182 Elm.Widget.event; 182 Elm.Widget.event;
183 Elm.Widget.part_access_object_get;
184 Elm.Layout.text.set; 183 Elm.Layout.text.set;
185 Elm.Layout.text.get; 184 Elm.Layout.text.get;
186 Elm.Layout.sizing_eval; 185 Elm.Layout.sizing_eval;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 9338418567..d347bdcc27 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -3696,14 +3696,6 @@ _elm_widget_focus_reconfigure(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
3696 _elm_widget_focus_move_policy_reload(obj); 3696 _elm_widget_focus_move_policy_reload(obj);
3697} 3697}
3698 3698
3699EOLIAN static Evas_Object*
3700_elm_widget_part_access_object_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *part)
3701{
3702 WRN("The %s widget does not implement the \"part_access_object_get\" functions.",
3703 eo_class_name_get(eo_class_get(obj)));
3704 return NULL;
3705}
3706
3707EAPI void 3699EAPI void
3708elm_widget_content_part_set(Evas_Object *obj, 3700elm_widget_content_part_set(Evas_Object *obj,
3709 const char *part, 3701 const char *part,
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 3a181955da..e495a4b405 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -837,15 +837,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
837 } 837 }
838 focus_reconfigure { 838 focus_reconfigure {
839 } 839 }
840 part_access_object_get {
841 [[Get the access object of given part of the widget.
842
843 @since 1.18]]
844 return: Efl.Canvas.Object;
845 params {
846 @in part: string; [[The object's part name to get access object]]
847 }
848 }
849 } 840 }
850 implements { 841 implements {
851 class.constructor; 842 class.constructor;
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 03526ceef8..b284475441 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -24,27 +24,7 @@ START_TEST (elm_atspi_role_get)
24} 24}
25END_TEST 25END_TEST
26 26
27START_TEST (elm_object_part_access_object_get)
28{
29 Evas_Object *win, *popup, *access;
30
31 elm_init(1, NULL);
32 elm_config_access_set(EINA_TRUE);
33 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
34
35 popup = elm_popup_add(win);
36 elm_object_part_text_set(popup, "title,text", "Title");
37 evas_object_show(popup);
38
39 access = elm_object_part_access_object_get(popup, "access.title");
40 ck_assert(access != NULL);
41
42 elm_shutdown();
43}
44END_TEST
45
46void elm_test_popup(TCase *tc) 27void elm_test_popup(TCase *tc)
47{ 28{
48 tcase_add_test(tc, elm_atspi_role_get); 29 tcase_add_test(tc, elm_atspi_role_get);
49 tcase_add_test(tc, elm_object_part_access_object_get);
50} 30}