summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-11-07 17:33:56 +0200
committerDaniel Hirt <hirt.danny@gmail.com>2018-01-18 11:01:07 +0200
commit4e935655901f06a5b20978c4487b4cf5a491848e (patch)
tree2851a5fba843a235abbbb815be09b359243a6eb6
parent15d32fd4cc41efd810e151455c3611d360621dac (diff)
Edje: remove item provider from eo api
-rw-r--r--src/lib/edje/Edje_Legacy.h16
-rw-r--r--src/lib/edje/edje_util.c6
-rw-r--r--src/lib/edje/efl_canvas_layout.eo16
3 files changed, 20 insertions, 18 deletions
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index b7350114d4..3df54f43b2 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3085,6 +3085,22 @@ EAPI const Edje_Perspective *edje_object_perspective_get(const Evas_Object *obj)
3085 */ 3085 */
3086 3086
3087 3087
3088/**
3089 * @brief Sets the function that provides item objects for named items in an
3090 * edje entry text
3091 *
3092 * Item objects may be deleted any time by Edje, and will be deleted when the
3093 * Edje object is deleted (or file is set to a new file).
3094 *
3095 * @param[in] obj The object.
3096 * @param[in] func The function to call (or @c null to disable) to get item
3097 * objects
3098 * @param[in] data The data pointer to pass to the func callback
3099 *
3100 * @ingroup Edje_Object
3101 */
3102EAPI void edje_object_item_provider_set(Edje_Object *obj, Edje_Item_Provider_Cb func, void *data);
3103
3088typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type; 3104typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
3089#define EDJE_PART_TYPE_NONE EFL_CANVAS_LAYOUT_PART_TYPE_NONE 3105#define EDJE_PART_TYPE_NONE EFL_CANVAS_LAYOUT_PART_TYPE_NONE
3090#define EDJE_PART_TYPE_RECTANGLE EFL_CANVAS_LAYOUT_PART_TYPE_RECTANGLE 3106#define EDJE_PART_TYPE_RECTANGLE EFL_CANVAS_LAYOUT_PART_TYPE_RECTANGLE
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 313258deee..5a72652a44 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -1906,9 +1906,11 @@ edje_object_part_object_get(const Eo *obj, const char *part)
1906 return rp->object; 1906 return rp->object;
1907} 1907}
1908 1908
1909EOLIAN void 1909EAPI void
1910_efl_canvas_layout_item_provider_set(Eo *obj EINA_UNUSED, Edje *ed, Edje_Item_Provider_Cb func, void *data) 1910edje_object_item_provider_set(Edje_Object *obj, Edje_Item_Provider_Cb func, void *data)
1911{ 1911{
1912 Edje *ed = _edje_fetch(obj);
1913 if (!ed) return;
1912 ed->item_provider.func = func; 1914 ed->item_provider.func = func;
1913 ed->item_provider.data = data; 1915 ed->item_provider.data = data;
1914} 1916}
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index b1596e77ac..3d86cbb958 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -40,22 +40,6 @@ class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
40 legacy: null; 40 legacy: null;
41 return: iterator<string> @owned; [[Part name iterator]] 41 return: iterator<string> @owned; [[Part name iterator]]
42 } 42 }
43
44 /* TEXT PART APIS BEGIN ---------------------------------------------- */
45 @property item_provider {
46 set {
47 [[Sets the function that provides item objects for named items in an edje entry text
48
49 Item objects may be deleted any time by Edje, and will be deleted when the
50 Edje object is deleted (or file is set to a new file).]]
51 }
52 values {
53 func: Edje.Item_Provider_Cb; [[The function to call (or $null to disable) to get item objects]]
54 data: void_ptr; [[The data pointer to pass to the func callback]]
55 }
56 }
57 /* TEXT PART APIS END ------------------------------------------------ */
58
59 @property seat { 43 @property seat {
60 get { 44 get {
61 [[Returns the seat device given its Edje's name. 45 [[Returns the seat device given its Edje's name.