hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eolian: Legacy integration of Evas Common Interface

This commit is contained in:
Yossi Kantor 2014-04-02 13:46:36 +03:00 committed by Daniel Zaoui
parent 33cf815737
commit f1e1a79822
4 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile_Evas.am
View File

@ -33,6 +33,7 @@ BUILT_SOURCES += \
lib/evas/canvas/evas_table.eo.legacy.h \
lib/evas/canvas/evas_common_interface.eo.c \
lib/evas/canvas/evas_common_interface.eo.h \
lib/evas/canvas/evas_common_interface.eo.legacy.h \
lib/evas/canvas/evas_object.eo.c \
lib/evas/canvas/evas_object.eo.h \
lib/evas/canvas/evas.eo.c \
@ -128,8 +129,10 @@ nodist_installed_evascanvasheaders_DATA = \
lib/evas/canvas/evas_textgrid.eo.legacy.h \
lib/evas/canvas/evas_table.eo.legacy.h \
lib/evas/canvas/evas_smart.eo.legacy.h \
lib/evas/canvas/evas_smart_clipped.eo.legacy.h
lib/evas/canvas/evas_smart_clipped.eo.legacy.h \
lib/evas/canvas/evas_table.eo.legacy.h \
lib/evas/canvas/evas_common_interface.eo.legacy.h
noinst_HEADERS = \
lib/evas/include/evas_inline.x \
lib/evas/include/evas_private.h \

13
src/lib/evas/Evas_Legacy.h
View File

@ -2148,18 +2148,7 @@ EAPI void evas_object_color_set(Evas_Object *obj, int r, int g, int
*/
EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) EINA_ARG_NONNULL(1);
/**
* Retrieves the Evas canvas that the given object lives on.
*
* @param obj The given Evas object.
* @return A pointer to the canvas where the object is on.
*
* This function is most useful at code contexts where you need to
* operate on the canvas but have only the object pointer.
*
* @ingroup Evas_Object_Group_Basic
*/
EAPI Evas *evas_object_evas_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
#include "canvas/evas_common_interface.eo.legacy.h"
/**
* Retrieves the type of the given Evas object.

2
src/lib/evas/canvas/evas_common_interface.eo
View File

@ -6,6 +6,7 @@ interface Evas_Common_Interface ()
evas {
get {
/*@ No description supplied by the EAPI. */
legacy evas_object_evas_get;
}
values {
Evas *ret;
@ -15,5 +16,4 @@ interface Evas_Common_Interface ()
implements {
virtual::evas::get;
}
}

11
src/lib/evas/canvas/evas_object_main.c
View File

@ -1411,17 +1411,6 @@ _evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *o
return obj->cur->render_op;
}
EAPI Evas *
evas_object_evas_get(const Evas_Object *eo_obj)
{
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
Evas *eo_evas = NULL;
eo_do((Eo *)eo_obj, eo_evas = evas_common_evas_get());
return eo_evas;
}
EOLIAN static void
_evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
{