summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-31 16:36:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 11:22:33 +0900
commit9cec14918c089d94a742cb067872181dd452b7ef (patch)
tree59fd6ae40189a1c9e500d795ae09bc88076b3096 /src/lib/evas
parentb8ca1272aee00314ca2cfb10214f36590084f6f0 (diff)
evas: Move evas_canvas.eo to legacy-only
This isn't meant to be installed. The canvas API in EO is based around the interfaces Efl.Canvas and the widget Efl.Ui.Win. Anything else is not EO (eg: ecore_evas, evas, ...) Note: evas_canvas3d is the last remaining thing that is installed along EO files, but those are all beta APIs.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Internal.h4
-rw-r--r--src/lib/evas/canvas/efl_input_event.c1
-rw-r--r--src/lib/evas/include/evas_private.h1
4 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index dbd65e1555..fcc7fc67fe 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -4,8 +4,6 @@
4 4
5#ifdef EFL_EO_API_SUPPORT 5#ifdef EFL_EO_API_SUPPORT
6 6
7#include "canvas/evas_canvas.eo.h"
8
9/** 7/**
10 * @ingroup Evas_Object_Rectangle 8 * @ingroup Evas_Object_Rectangle
11 * 9 *
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 2a84270917..09cc2c8f4e 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -63,6 +63,10 @@ EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
63EOAPI void efl_canvas_group_add(Eo *obj); 63EOAPI void efl_canvas_group_add(Eo *obj);
64EOAPI void efl_canvas_group_del(Eo *obj); 64EOAPI void efl_canvas_group_del(Eo *obj);
65EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped); 65EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped);
66EOAPI void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y);
67EOAPI void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat);
68EOAPI void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat);
69EOAPI Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat);
66 70
67EOAPI void *efl_input_legacy_info_get(const Eo *obj); 71EOAPI void *efl_input_legacy_info_get(const Eo *obj);
68EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv); 72EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv);
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 745ab8f8ca..f18eb3d136 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -6,6 +6,7 @@
6 6
7#include <Evas.h> 7#include <Evas.h>
8#include <Evas_Internal.h> 8#include <Evas_Internal.h>
9#include "canvas/evas_canvas.eo.h"
9 10
10#define EFL_INTERNAL_UNSTABLE 11#define EFL_INTERNAL_UNSTABLE
11#include "interfaces/efl_common_internal.h" 12#include "interfaces/efl_common_internal.h"
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 2cedf01807..ebc14a44c9 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -50,6 +50,7 @@
50#define ENFN obj->layer->evas->engine.func 50#define ENFN obj->layer->evas->engine.func
51#define ENC _evas_engine_context(obj->layer->evas) 51#define ENC _evas_engine_context(obj->layer->evas)
52 52
53#include "canvas/evas_canvas.eo.h"
53#include "canvas/evas_text.eo.h" 54#include "canvas/evas_text.eo.h"
54#include "canvas/evas_textgrid.eo.h" 55#include "canvas/evas_textgrid.eo.h"
55#include "canvas/evas_line.eo.h" 56#include "canvas/evas_line.eo.h"