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.
This commit is contained in:
Stefan Schmidt 2016-06-14 16:19:50 +02:00
parent e187f38dd9
commit ddbf379359
2 changed files with 12 additions and 3 deletions

View File

@ -289,9 +289,7 @@ extern "C" {
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <Evas_Legacy.h>
#endif
#ifdef EFL_EO_API_SUPPORT
#include <Evas_Eo.h>
#endif
#ifdef __cplusplus
}

View File

@ -2,6 +2,7 @@
# error You shall not include this header directly
#endif
#ifdef EFL_EO_API_SUPPORT
#include "canvas/efl_ui_draggable.eo.h"
#include "canvas/efl_ui_clickable.eo.h"
#include "canvas/efl_ui_scrollable.eo.h"
@ -65,7 +66,9 @@
#include "canvas/evas_common_interface.eo.h"
#include "canvas/evas_object.eo.h"
#endif /* EFL_EO_API_SUPPORT */
#ifdef EFL_BETA_API_SUPPORT
/**
* @defgroup Evas_3D Evas 3D Extensions
*
@ -270,12 +273,17 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
#include "canvas/evas_canvas3d_scene.eo.h"
#include "canvas/efl_canvas_scene3d.eo.h"
#endif /* EFL_BETA_API_SUPPORT */
#ifdef EFL_EO_API_SUPPORT
#include "canvas/efl_canvas_image_internal.eo.h"
#include "canvas/efl_canvas_image.eo.h"
#include "canvas/efl_canvas_snapshot.eo.h"
#include "canvas/efl_canvas_proxy.eo.h"
#include "canvas/efl_canvas_scene3d.eo.h"
#endif /* EFL_EO_API_SUPPORT */
#ifdef EFL_BETA_API_SUPPORT
/**
* @ingroup Evas_Object_VG
*
@ -292,7 +300,10 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
#include "canvas/efl_vg_gradient.eo.h"
#include "canvas/efl_vg_gradient_linear.eo.h"
#include "canvas/efl_vg_gradient_radial.eo.h"
#endif /* EFL_BETA_API_SUPPORT */
#ifdef EFL_EO_API_SUPPORT
#include "canvas/efl_event_input.eo.h"
#include "canvas/efl_event_pointer.eo.h"
#endif /* EFL_EO_API_SUPPORT */
#include "canvas/efl_event_key.eo.h"