summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-27 10:27:05 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-30 10:01:00 +0200
commita289d6c0eac438739a290865d686af91ec3975ba (patch)
tree6ffeeb4c8bb02e4b8986ea4eee819e6a4b749b7f
parent0e21ce343d034e095b2778aec41deac92b59531a (diff)
edje: add Efl_Layout.h for eo-based layout headers
this includes all related headers ref T8274 Additional Authors: Lauro Moura <lauromoura@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D10228
-rw-r--r--src/lib/edje/Efl_Layout.h61
-rw-r--r--src/lib/edje/meson.build1
-rw-r--r--src/tests/edje/efl_test_layout.c2
-rw-r--r--src/tests/edje/efl_test_layout2.c2
-rw-r--r--src/tests/edje/efl_test_layout3.c2
-rw-r--r--src/tests/edje/meson.build3
6 files changed, 71 insertions, 0 deletions
diff --git a/src/lib/edje/Efl_Layout.h b/src/lib/edje/Efl_Layout.h
new file mode 100644
index 0000000000..123ce3053d
--- /dev/null
+++ b/src/lib/edje/Efl_Layout.h
@@ -0,0 +1,61 @@
1#ifndef _EFL_LAYOUT_H
2#define _EFL_LAYOUT_H
3
4#include <Efl_Config.h>
5
6#include <Eina.h>
7
8#include <Eo.h>
9/* This include has been added to support Eo in Evas */
10#include <Efl.h>
11#ifdef EAPI
12# undef EAPI
13#endif
14
15#ifdef _WIN32
16# ifdef EFL_BUILD
17# ifdef DLL_EXPORT
18# define EAPI __declspec(dllexport)
19# else
20# define EAPI
21# endif
22# else
23# define EAPI __declspec(dllimport)
24# endif
25#else
26# ifdef __GNUC__
27# if __GNUC__ >= 4
28# define EAPI __attribute__ ((visibility("default")))
29# else
30# define EAPI
31# endif
32# else
33# define EAPI
34# endif
35#endif
36
37#ifdef __cplusplus
38extern "C" {
39#endif
40
41#include <efl_layout_calc.eo.h>
42#include <efl_layout_signal.eo.h>
43#include <efl_layout_group.eo.h>
44#include <efl_canvas_layout.eo.h>
45
46#include <efl_canvas_layout_types.eot.h>
47
48#include <efl_canvas_layout_part.eo.h>
49#include <efl_canvas_layout_part_box.eo.h>
50#include <efl_canvas_layout_part_table.eo.h>
51#include <efl_canvas_layout_part_swallow.eo.h>
52#include <efl_canvas_layout_part_text.eo.h>
53#include <efl_canvas_layout_part_external.eo.h>
54
55#ifdef __cplusplus
56}
57#endif
58
59#undef EAPI
60
61#endif
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 60452fe672..1ab13e314c 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -90,6 +90,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
90 90
91edje_header_src = [ 91edje_header_src = [
92 'Edje.h', 92 'Edje.h',
93 'Efl_Layout.h',
93 'Edje_Common.h', 94 'Edje_Common.h',
94 'Edje_Eo.h', 95 'Edje_Eo.h',
95 'Edje_Legacy.h', 96 'Edje_Legacy.h',
diff --git a/src/tests/edje/efl_test_layout.c b/src/tests/edje/efl_test_layout.c
new file mode 100644
index 0000000000..64b3302428
--- /dev/null
+++ b/src/tests/edje/efl_test_layout.c
@@ -0,0 +1,2 @@
1#undef EFL_BETA_API_SUPPORT
2#include "Efl_Layout.h"
diff --git a/src/tests/edje/efl_test_layout2.c b/src/tests/edje/efl_test_layout2.c
new file mode 100644
index 0000000000..7a94a28f15
--- /dev/null
+++ b/src/tests/edje/efl_test_layout2.c
@@ -0,0 +1,2 @@
1#define EFL_NOLEGACY_API_SUPPORT
2#include "Efl_Layout.h"
diff --git a/src/tests/edje/efl_test_layout3.c b/src/tests/edje/efl_test_layout3.c
new file mode 100644
index 0000000000..f4bdfbda51
--- /dev/null
+++ b/src/tests/edje/efl_test_layout3.c
@@ -0,0 +1,2 @@
1//#define EFL_BETA_API_SUPPORT defined by build system already
2#include "Efl_Layout.h"
diff --git a/src/tests/edje/meson.build b/src/tests/edje/meson.build
index adfd19242f..668f1b0d35 100644
--- a/src/tests/edje/meson.build
+++ b/src/tests/edje/meson.build
@@ -10,6 +10,9 @@ edje_suite_src = [
10 'edje_test_signal.c', 10 'edje_test_signal.c',
11 'edje_test_swallow.c', 11 'edje_test_swallow.c',
12 'edje_test_text.c', 12 'edje_test_text.c',
13 'efl_test_layout.c',
14 'efl_test_layout2.c',
15 'efl_test_layout3.c',
13] 16]
14 17
15edje_suite = executable('edje_suite', 18edje_suite = executable('edje_suite',