diff options
author | Stefan Schmidt <stefan@osg.samsung.com> | 2016-06-14 16:19:50 +0200 |
---|---|---|
committer | Stefan Schmidt <stefan@osg.samsung.com> | 2016-06-14 16:27:10 +0200 |
commit | ddbf379359652968e980f3dadc47390561e4aba7 (patch) | |
tree | 763812f8829f77b6654dffd17aa4f89d73eea8e0 /src/lib/evas/Evas_Eo.h | |
parent | e187f38dd9b23151222b6ecfb9e951fcb7fb8dbb (diff) |
evas: move canvas3d and vg parts into beta API and keep the rest under EO API
Vanvas3d and VG are still conisereed beta. For the rest we are going to sort
this out over the next days/weeks. Either EO API flag removed or put under BETA.
Diffstat (limited to 'src/lib/evas/Evas_Eo.h')
-rw-r--r-- | src/lib/evas/Evas_Eo.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 7a499a5271..c620f5cbe6 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h | |||
@@ -2,6 +2,7 @@ | |||
2 | # error You shall not include this header directly | 2 | # error You shall not include this header directly |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #ifdef EFL_EO_API_SUPPORT | ||
5 | #include "canvas/efl_ui_draggable.eo.h" | 6 | #include "canvas/efl_ui_draggable.eo.h" |
6 | #include "canvas/efl_ui_clickable.eo.h" | 7 | #include "canvas/efl_ui_clickable.eo.h" |
7 | #include "canvas/efl_ui_scrollable.eo.h" | 8 | #include "canvas/efl_ui_scrollable.eo.h" |
@@ -65,7 +66,9 @@ | |||
65 | #include "canvas/evas_common_interface.eo.h" | 66 | #include "canvas/evas_common_interface.eo.h" |
66 | 67 | ||
67 | #include "canvas/evas_object.eo.h" | 68 | #include "canvas/evas_object.eo.h" |
69 | #endif /* EFL_EO_API_SUPPORT */ | ||
68 | 70 | ||
71 | #ifdef EFL_BETA_API_SUPPORT | ||
69 | /** | 72 | /** |
70 | * @defgroup Evas_3D Evas 3D Extensions | 73 | * @defgroup Evas_3D Evas 3D Extensions |
71 | * | 74 | * |
@@ -270,12 +273,17 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x, | |||
270 | 273 | ||
271 | #include "canvas/evas_canvas3d_scene.eo.h" | 274 | #include "canvas/evas_canvas3d_scene.eo.h" |
272 | 275 | ||
276 | #include "canvas/efl_canvas_scene3d.eo.h" | ||
277 | #endif /* EFL_BETA_API_SUPPORT */ | ||
278 | |||
279 | #ifdef EFL_EO_API_SUPPORT | ||
273 | #include "canvas/efl_canvas_image_internal.eo.h" | 280 | #include "canvas/efl_canvas_image_internal.eo.h" |
274 | #include "canvas/efl_canvas_image.eo.h" | 281 | #include "canvas/efl_canvas_image.eo.h" |
275 | #include "canvas/efl_canvas_snapshot.eo.h" | 282 | #include "canvas/efl_canvas_snapshot.eo.h" |
276 | #include "canvas/efl_canvas_proxy.eo.h" | 283 | #include "canvas/efl_canvas_proxy.eo.h" |
277 | #include "canvas/efl_canvas_scene3d.eo.h" | 284 | #endif /* EFL_EO_API_SUPPORT */ |
278 | 285 | ||
286 | #ifdef EFL_BETA_API_SUPPORT | ||
279 | /** | 287 | /** |
280 | * @ingroup Evas_Object_VG | 288 | * @ingroup Evas_Object_VG |
281 | * | 289 | * |
@@ -292,7 +300,10 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x, | |||
292 | #include "canvas/efl_vg_gradient.eo.h" | 300 | #include "canvas/efl_vg_gradient.eo.h" |
293 | #include "canvas/efl_vg_gradient_linear.eo.h" | 301 | #include "canvas/efl_vg_gradient_linear.eo.h" |
294 | #include "canvas/efl_vg_gradient_radial.eo.h" | 302 | #include "canvas/efl_vg_gradient_radial.eo.h" |
303 | #endif /* EFL_BETA_API_SUPPORT */ | ||
295 | 304 | ||
305 | #ifdef EFL_EO_API_SUPPORT | ||
296 | #include "canvas/efl_event_input.eo.h" | 306 | #include "canvas/efl_event_input.eo.h" |
297 | #include "canvas/efl_event_pointer.eo.h" | 307 | #include "canvas/efl_event_pointer.eo.h" |
308 | #endif /* EFL_EO_API_SUPPORT */ | ||
298 | #include "canvas/efl_event_key.eo.h" | 309 | #include "canvas/efl_event_key.eo.h" |