summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-05-21 15:54:27 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-06-10 08:09:48 +0300
commit00b87404b81fc4683f182431bad4be78a2e495dc (patch)
treedfed479aa3993d058dc60c2f9fc8261d2bc6a0f5
parent30c63b1f56461030f39a62d04e5260edaff3b1b7 (diff)
downloadefl-devs/jackdanielz/eo_interfaces.tar.gz
Interfaces: Integration into Makefile + fix of .eodevs/jackdanielz/eo_interfaces
-rw-r--r--src/Makefile_Efl.am26
-rw-r--r--src/lib/efl/interfaces/efl_interface_color.eo8
-rw-r--r--src/lib/efl/interfaces/efl_interface_file.eo1
-rw-r--r--src/lib/efl/interfaces/efl_interface_gui_object.eo29
-rw-r--r--src/lib/efl/interfaces/efl_interface_image.eo1
-rw-r--r--src/lib/efl/interfaces/efl_interface_text.eo1
-rw-r--r--src/lib/efl/interfaces/efl_interface_text_properties.eo2
7 files changed, 55 insertions, 13 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c5fe87fd7a..aea1c48877 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,3 +1,29 @@
+BUILT_SOURCES += \
+ lib/efl/interfaces/efl_interface_color.eo.c \
+ lib/efl/interfaces/efl_interface_color.eo.h \
+ lib/efl/interfaces/efl_interface_file.eo.c \
+ lib/efl/interfaces/efl_interface_file.eo.h \
+ lib/efl/interfaces/efl_interface_gui_object.eo.c \
+ lib/efl/interfaces/efl_interface_gui_object.eo.h \
+ lib/efl/interfaces/efl_interface_image.eo.c \
+ lib/efl/interfaces/efl_interface_image.eo.h \
+ lib/efl/interfaces/efl_interface_text.eo.c \
+ lib/efl/interfaces/efl_interface_text.eo.h \
+ lib/efl/interfaces/efl_interface_text_properties.eo.c \
+ lib/efl/interfaces/efl_interface_text_properties.eo.h
+
+efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
+efleolianfiles_DATA = \
+ lib/efl/interfaces/efl_interface_color.eo \
+ lib/efl/interfaces/efl_interface_file.eo \
+ lib/efl/interfaces/efl_interface_gui_object.eo \
+ lib/efl/interfaces/efl_interface_image.eo \
+ lib/efl/interfaces/efl_interface_text.eo \
+ lib/efl/interfaces/efl_interface_text_properties.eo
+
+EXTRA_DIST += \
+ ${efleolianfiles_DATA}
+
installed_eflheadersdir = $(includedir)/efl-@VMAJ@
dist_installed_eflheaders_DATA = \
lib/efl/Efl_Config.h
diff --git a/src/lib/efl/interfaces/efl_interface_color.eo b/src/lib/efl/interfaces/efl_interface_color.eo
index d3cc615df7..2dba646287 100644
--- a/src/lib/efl/interfaces/efl_interface_color.eo
+++ b/src/lib/efl/interfaces/efl_interface_color.eo
@@ -1,12 +1,20 @@
+interface Efl_Interface_Part
+{
+ legacy_prefix: null;
+}
+
interface Efl_Interface_Color_Enum_Part (Efl_Interface_Part)
{
+ legacy_prefix: null;
}
interface Efl_Interface_Color_Text_Part (Efl_Interface_Part)
{
+ legacy_prefix: null;
}
interface Efl_Interface_Color {
+ legacy_prefix: null;
properties {
color {
set {
diff --git a/src/lib/efl/interfaces/efl_interface_file.eo b/src/lib/efl/interfaces/efl_interface_file.eo
index cf6098637c..464b7fa48e 100644
--- a/src/lib/efl/interfaces/efl_interface_file.eo
+++ b/src/lib/efl/interfaces/efl_interface_file.eo
@@ -1,4 +1,5 @@
interface Efl_Interface_File {
+ legacy_prefix: null;
properties {
file {
set {
diff --git a/src/lib/efl/interfaces/efl_interface_gui_object.eo b/src/lib/efl/interfaces/efl_interface_gui_object.eo
index c572df7583..ae0e17bffd 100644
--- a/src/lib/efl/interfaces/efl_interface_gui_object.eo
+++ b/src/lib/efl/interfaces/efl_interface_gui_object.eo
@@ -1,4 +1,5 @@
interface Efl_Interface_Gui_Object {
+ legacy_prefix: null;
properties {
size {
set {
@@ -46,6 +47,21 @@ interface Efl_Interface_Gui_Object {
return Evas_Object * @warn_unused;
}
}
+ visibility {
+ set {
+ /*@ Makes the given Evas object visible or invisible. */
+ legacy null;
+ }
+ get {
+ /*@ Retrieves whether or not the given Evas object is visible. */
+ legacy null;
+ }
+ values {
+ Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
+ }
+ }
+ }
+ methods {
stack_above {
/*@
Stack @p obj immediately above @p above
@@ -126,19 +142,6 @@ interface Efl_Interface_Gui_Object {
@see evas_object_raise() */
}
- visibility {
- set {
- /*@ Makes the given Evas object visible or invisible. */
- legacy null;
- }
- get {
- /*@ Retrieves whether or not the given Evas object is visible. */
- legacy evas_object_visible_get;
- }
- values {
- Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
- }
- }
}
}
diff --git a/src/lib/efl/interfaces/efl_interface_image.eo b/src/lib/efl/interfaces/efl_interface_image.eo
index f6a2e37aa0..edbf693550 100644
--- a/src/lib/efl/interfaces/efl_interface_image.eo
+++ b/src/lib/efl/interfaces/efl_interface_image.eo
@@ -1,4 +1,5 @@
interface Efl_Interface_File {
+ legacy_prefix: null;
properties {
data_copy {
set {
diff --git a/src/lib/efl/interfaces/efl_interface_text.eo b/src/lib/efl/interfaces/efl_interface_text.eo
index 8f4ef8466b..587799d4a1 100644
--- a/src/lib/efl/interfaces/efl_interface_text.eo
+++ b/src/lib/efl/interfaces/efl_interface_text.eo
@@ -1,4 +1,5 @@
interface Efl_Interface_Text {
+ legacy_prefix: null;
properties {
text_markup {
set {
diff --git a/src/lib/efl/interfaces/efl_interface_text_properties.eo b/src/lib/efl/interfaces/efl_interface_text_properties.eo
index 4d0bac04cf..120012912a 100644
--- a/src/lib/efl/interfaces/efl_interface_text_properties.eo
+++ b/src/lib/efl/interfaces/efl_interface_text_properties.eo
@@ -1,4 +1,5 @@
interface Efl_Interface_Text_Properties {
+ legacy_prefix: null;
properties {
font {
set {
@@ -33,4 +34,5 @@ interface Efl_Interface_Text_Properties {
}
implements {
virtual::font;
+ }
}