summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-18 17:41:37 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-19 14:07:00 +0900
commit4310e641cdcb248af0c1c0299a2ae3591af83f4d (patch)
tree1d8c2410ad5b45852ec7d7e1618a88a7e6e4215d
parent781594088e56b0887e2e87c4b8587b933ff06c40 (diff)
evas: Make Efl.Canvas.Object.type internal
-rw-r--r--src/lib/elementary/elm_priv.h3
-rw-r--r--src/lib/emotion/emotion_smart.c2
-rw-r--r--src/lib/evas/Evas_Internal.h1
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
5 files changed, 9 insertions, 13 deletions
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8abe670..135d054 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -47,6 +47,9 @@
47# endif 47# endif
48#endif /* ! _WIN32 */ 48#endif /* ! _WIN32 */
49 49
50// Evas internal EO APIs
51#include "Evas_Internal.h"
52
50#include "elm_widget.h" 53#include "elm_widget.h"
51#include "elm_access.eo.h" 54#include "elm_access.eo.h"
52#include "elm_code_private.h" 55#include "elm_code_private.h"
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 0cfa317..e7ba4a8 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -14,6 +14,8 @@
14# include <Eio.h> 14# include <Eio.h>
15#endif 15#endif
16 16
17#include <Evas_Internal.h>
18
17#include "Emotion.h" 19#include "Emotion.h"
18#include "emotion_private.h" 20#include "emotion_private.h"
19 21
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index e4985b0..29d3e06 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -49,6 +49,7 @@ EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
49 49
50/* Internal EO APIs */ 50/* Internal EO APIs */
51EOAPI void efl_canvas_object_legacy_ctor(Eo *obj); 51EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
52EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
52 53
53 54
54#ifdef __cplusplus 55#ifdef __cplusplus
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index fde562b..687cc8b 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -8,15 +8,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
8 legacy_prefix: evas_object; 8 legacy_prefix: evas_object;
9 data: Evas_Object_Protected_Data; 9 data: Evas_Object_Protected_Data;
10 methods { 10 methods {
11 @property type @protected {
12 set {
13 [[Sets the legacy type name of this Evas object.]]
14 legacy: null;
15 }
16 values {
17 type: string; [[The type of the object.]]
18 }
19 }
20 @property pointer_mode_by_device { 11 @property pointer_mode_by_device {
21 [[Low-level pointer behaviour by device. 12 [[Low-level pointer behaviour by device.
22 See @.pointer_mode.get and @.pointer_mode.set for more explanation. 13 See @.pointer_mode.get and @.pointer_mode.set for more explanation.
@@ -616,9 +607,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
616 } 607 }
617 } 608 }
618 } 609 }
619 constructors {
620 .type;
621 }
622 implements { 610 implements {
623 Efl.Object.constructor; 611 Efl.Object.constructor;
624 Efl.Object.destructor; 612 Efl.Object.destructor;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 11ae1b7..b0baadb 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2563,11 +2563,13 @@ evas_object_size_hint_display_mode_get(const Evas_Object *obj)
2563/* Internal EO APIs and hidden overrides */ 2563/* Internal EO APIs and hidden overrides */
2564 2564
2565EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor) 2565EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor)
2566EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_type_set, EFL_FUNC_CALL(type), const char *type)
2566 2567
2567#define EFL_CANVAS_OBJECT_EXTRA_OPS \ 2568#define EFL_CANVAS_OBJECT_EXTRA_OPS \
2568 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \ 2569 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \
2569 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_canvas_object_efl_object_event_callback_legacy_call), \ 2570 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_canvas_object_efl_object_event_callback_legacy_call), \
2570 EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_canvas_object_efl_object_event_callback_call), \ 2571 EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_canvas_object_efl_object_event_callback_call), \
2571 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor) 2572 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor), \
2573 EFL_OBJECT_OP_FUNC(efl_canvas_object_type_set, _efl_canvas_object_type_set)
2572 2574
2573#include "canvas/efl_canvas_object.eo.c" 2575#include "canvas/efl_canvas_object.eo.c"