enlightenment/python-efl
enlightenment
/
python-efl
7
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Follow Eo -> Efl renames

This commit is contained in:
Kai Huuhko 2016-08-21 19:53:41 +03:00
parent 212eca4321
commit 6fa2d3ff95
7 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
efl/elementary/elementary_cdef.pxi
View File

@ -1,4 +1,4 @@
from efl.c_eo cimport Eo as cEo, Eo_Class, eo_add
from efl.c_eo cimport Eo as cEo, Efl_Class, efl_add
from efl.eina cimport Eina_Rectangle, Eina_Compare_Cb, \
eina_list_free, eina_list_append, eina_stringshare_del
from efl.evas cimport Eina_List, Eina_Bool, Evas_Object, Evas_Font_Size, \

6
efl/elementary/systray.pxi
View File

@ -26,7 +26,7 @@ cdef class Systray(Eo):
"""
def __init__(self, Eo parent not None, *args, **kwargs):
cdef cEo *obj = eo_add(elm_systray_class_get(), parent.obj)
cdef cEo *obj = efl_add(elm_systray_class_get(), parent.obj)
self._set_obj(obj)
self._set_properties_from_keyword_args(kwargs)
@ -108,13 +108,13 @@ cdef class Systray(Eo):
elm_obj_systray_menu_set(self.obj, value.obj)
def __get__(self):
return object_from_instance(elm_obj_systray_menu_get(self.obj))
return object_from_instance(<cEo *>elm_obj_systray_menu_get(self.obj))
def menu_set(self, Eo value):
elm_obj_systray_menu_set(self.obj, value.obj)
def menu_get(self):
return object_from_instance(elm_obj_systray_menu_get(self.obj))
return object_from_instance(<cEo *>elm_obj_systray_menu_get(self.obj))
property att_icon_name:
"""The name of the attention icon to be used by the Status Notifier Item.

2
efl/elementary/systray_cdef.pxi
View File

@ -4,7 +4,7 @@ cdef extern from "Elementary.h":
ctypedef cEo Elm_Systray
const Eo_Class *elm_systray_class_get()
const Efl_Class *elm_systray_class_get()
void elm_obj_systray_id_set(cEo *obj, const char *id)
const char * elm_obj_systray_id_get(const cEo *obj)

66
efl/eo/efl.eo.pyx
View File

@ -36,15 +36,15 @@ from efl.eina cimport Eina_Bool, \
Eina_Hash, eina_hash_string_superfast_new, eina_hash_add, eina_hash_del, \
eina_hash_find, EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, \
Eina_Iterator, eina_iterator_next, eina_iterator_free
from efl.c_eo cimport Eo as cEo, eo_init, eo_shutdown, eo_del, \
eo_class_name_get, eo_class_get, eo_base_class_get,\
eo_key_data_set, eo_key_data_get, \
eo_event_callback_add, eo_event_callback_del, EO_EVENT_DEL, \
eo_parent_get, eo_parent_set, Eo_Event_Description, \
eo_event_freeze, eo_event_thaw, eo_event_freeze_count_get, \
eo_event_global_freeze, eo_event_global_thaw, \
eo_event_global_freeze_count_get, eo_event_callback_stop, \
eo_children_iterator_new, Eo_Event
from efl.c_eo cimport Eo as cEo, efl_object_init, efl_object_shutdown, efl_del, \
efl_class_name_get, efl_class_get, efl_object_class_get,\
efl_key_data_set, efl_key_data_get, \
efl_event_callback_add, efl_event_callback_del, EFL_EVENT_DEL, \
efl_parent_get, efl_parent_set, Efl_Event_Description, \
efl_event_freeze, efl_event_thaw, efl_event_freeze_count_get, \
efl_event_global_freeze, efl_event_global_thaw, \
efl_event_global_freeze_count_get, efl_event_callback_stop, \
efl_children_iterator_new, Eo_Event
from efl.utils.logger cimport add_logger
@ -61,23 +61,23 @@ import atexit
def init():
EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Initializing efl.eo", NULL)
return eo_init()
return efl_object_init()
def shutdown():
EINA_LOG_DOM_INFO(PY_EFL_EO_LOG_DOMAIN, "Shutting down efl.eo", NULL)
return eo_shutdown()
return efl_object_shutdown()
init()
atexit.register(shutdown)
def event_global_freeze_count_get():
return eo_event_global_freeze_count_get(<const cEo *>eo_base_class_get())
return efl_event_global_freeze_count_get(<const cEo *>efl_object_class_get())
def event_global_freeze():
eo_event_global_freeze(<const cEo *>eo_base_class_get())
efl_event_global_freeze(<const cEo *>efl_object_class_get())
def event_global_thaw():
eo_event_global_thaw(<const cEo *>eo_base_class_get())
efl_event_global_thaw(<const cEo *>efl_object_class_get())
######################################################################
@ -113,14 +113,14 @@ cdef api object object_from_instance(cEo *obj):
cdef:
void *data = NULL
Eo o
const char *cls_name = eo_class_name_get(eo_class_get(obj))
const char *cls_name = efl_class_name_get(efl_class_get(obj))
type cls
void *cls_ret
if obj == NULL:
return None
data = eo_key_data_get(obj, "python-eo")
data = efl_key_data_get(obj, "python-eo")
if data != NULL:
EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN,
"Returning a Python object instance for Eo of type %s.", cls_name)
@ -182,16 +182,16 @@ cdef void _register_decorated_callbacks(Eo obj):
######################################################################
cdef void _eo_event_del_cb(void *data, const Eo_Event *event) with gil:
cdef void _efl_event_del_cb(void *data, const Eo_Event *event) with gil:
cdef:
Eo self = <Eo>data
const char *cls_name = eo_class_name_get(eo_class_get(self.obj))
const char *cls_name = efl_class_name_get(efl_class_get(self.obj))
EINA_LOG_DOM_DBG(PY_EFL_EO_LOG_DOMAIN, "Deleting Eo: %s", cls_name)
eo_event_callback_stop(self.obj)
eo_event_callback_del(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self)
eo_key_data_set(self.obj, "python-eo", NULL)
efl_event_callback_stop(self.obj)
efl_event_callback_del(self.obj, EFL_EVENT_DEL, _efl_event_del_cb, <const void *>self)
efl_key_data_set(self.obj, "python-eo", NULL)
self.obj = NULL
Py_DECREF(self)
@ -235,7 +235,7 @@ cdef class Eo(object):
def __repr__(self):
cdef cEo *parent = NULL
if self.obj != NULL:
parent = eo_parent_get(self.obj)
parent = efl_parent_get(self.obj)
return ("<%s object (Eo) at %#x (obj=%#x, parent=%#x, refcount=%d)>") % (
type(self).__name__,
<uintptr_t><void *>self,
@ -251,14 +251,14 @@ cdef class Eo(object):
assert obj != NULL, "Cannot set a NULL object"
self.obj = obj
eo_key_data_set(self.obj, "python-eo", <void *>self)
eo_event_callback_add(self.obj, EO_EVENT_DEL, _eo_event_del_cb, <const void *>self)
efl_key_data_set(self.obj, "python-eo", <void *>self)
efl_event_callback_add(self.obj, EFL_EVENT_DEL, _efl_event_del_cb, <const void *>self)
Py_INCREF(self)
# from efl 1.18 eo.parent changed behaviour, objects are now reparented
# when, fe, swallowed. This is the hack to keep the old behavior.
try:
parent = object_from_instance(eo_parent_get(obj))
parent = object_from_instance(efl_parent_get(obj))
except ValueError:
parent = None
self.internal_data["_legacy_parent"] = parent
@ -268,7 +268,7 @@ cdef class Eo(object):
def _wipe_obj_data_NEVER_USE_THIS(self):
# only used in tests/eo/test_02_class_names.py
# to force object_from_instance() to recreate the obj
eo_key_data_set(self.obj, "python-eo", NULL)
efl_key_data_set(self.obj, "python-eo", NULL)
cdef int _set_properties_from_keyword_args(self, dict kwargs) except 0:
if kwargs:
@ -277,7 +277,7 @@ cdef class Eo(object):
return 1
def __iter__(self):
return EoIterator.create(eo_children_iterator_new(self.obj))
return EoIterator.create(efl_children_iterator_new(self.obj))
def delete(self):
"""Delete the object and free internal resources.
@ -287,7 +287,7 @@ cdef class Eo(object):
garbage collector when there are no more reference to it.
"""
eo_del(self.obj)
efl_del(self.obj)
def is_deleted(self):
"""Check if the object has been deleted thus leaving the object shallow.
@ -306,25 +306,25 @@ cdef class Eo(object):
"""
def __set__(self, Eo parent):
self.internal_data["_legacy_parent"] = parent
eo_parent_set(self.obj, parent.obj)
efl_parent_set(self.obj, parent.obj)
def __get__(self):
return self.internal_data["_legacy_parent"]
def parent_set(self, Eo parent):
self.internal_data["_legacy_parent"] = parent
eo_parent_set(self.obj, parent.obj)
efl_parent_set(self.obj, parent.obj)
def parent_get(self):
return self.internal_data["_legacy_parent"]
def event_freeze(self):
"""Pause event propagation for this object."""
eo_event_freeze(self.obj)
efl_event_freeze(self.obj)
def event_thaw(self):
"""Restart event propagation for this object."""
eo_event_thaw(self.obj)
efl_event_thaw(self.obj)
def event_freeze_count_get(self):
"""Get the event freeze count for this object.
@ -333,4 +333,4 @@ cdef class Eo(object):
:rtype: int
"""
return eo_event_freeze_count_get(self.obj)
return efl_event_freeze_count_get(self.obj)

28
efl/evas/efl.evas_object_smart.pxi
View File

@ -16,7 +16,7 @@
# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
from efl.utils.conversions cimport eina_list_objects_to_python_list
from efl.c_eo cimport eo_key_data_set, eo_key_data_get
from efl.c_eo cimport efl_key_data_set, efl_key_data_get
from efl.eo cimport Eo, EoIterator
from cpython cimport Py_INCREF, Py_DECREF, PyObject_Call, \
@ -106,7 +106,7 @@ cdef void _smart_object_delete(Evas_Object *o) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -131,7 +131,7 @@ cdef void _smart_object_move(Evas_Object *o, Evas_Coord x, Evas_Coord y) with gi
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -156,7 +156,7 @@ cdef void _smart_object_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h) with
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -181,7 +181,7 @@ cdef void _smart_object_show(Evas_Object *o) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -206,7 +206,7 @@ cdef void _smart_object_hide(Evas_Object *o) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -231,7 +231,7 @@ cdef void _smart_object_color_set(Evas_Object *o, int r, int g, int b, int a) wi
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -257,7 +257,7 @@ cdef void _smart_object_clip_set(Evas_Object *o, Evas_Object *clip) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -284,7 +284,7 @@ cdef void _smart_object_clip_unset(Evas_Object *o) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -309,7 +309,7 @@ cdef void _smart_object_calculate(Evas_Object *o) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -335,7 +335,7 @@ cdef void _smart_object_member_add(Evas_Object *o, Evas_Object *clip) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -363,7 +363,7 @@ cdef void _smart_object_member_del(Evas_Object *o, Evas_Object *clip) with gil:
return
cls = <Smart>tmp
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_WARN(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
obj = None
@ -406,7 +406,7 @@ cdef void _smart_callback(void *data, Evas_Object *o, void *event_info) with gil
list tmp_args
list lst
tmp = eo_key_data_get(o, "python-eo")
tmp = efl_key_data_get(o, "python-eo")
if tmp == NULL:
EINA_LOG_DOM_ERR(PY_EFL_EVAS_LOG_DOMAIN, "obj is NULL!", NULL)
return
@ -704,7 +704,7 @@ cdef class SmartObject(Object):
assert obj != NULL, "Cannot set a NULL object"
self.obj = obj
eo_key_data_set(self.obj, "python-eo", <void *>self)
efl_key_data_set(self.obj, "python-eo", <void *>self)
evas_object_event_callback_add(obj, enums.EVAS_CALLBACK_FREE,
obj_free_cb, <void *>self)
Py_INCREF(self)

130
include/efl.c_eo.pxd
View File

@ -22,56 +22,56 @@ cdef extern from "Eo.h":
####################################################################
# Enums (not exported to python, only for internal use)
#
cdef enum:
EO_BASE_SUB_ID_CONSTRUCTOR
EO_BASE_SUB_ID_DESTRUCTOR
EO_BASE_SUB_ID_PARENT_SET
EO_BASE_SUB_ID_PARENT_GET
EO_BASE_SUB_ID_CHILDREN_ITERATOR_NEW
EO_BASE_SUB_ID_DATA_SET
EO_BASE_SUB_ID_DATA_GET
EO_BASE_SUB_ID_DATA_DEL
EO_BASE_SUB_ID_WREF_ADD
EO_BASE_SUB_ID_WREF_DEL
EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD
EO_BASE_SUB_ID_EVENT_CALLBACK_DEL
EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_PRIORITY_ADD
EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_DEL
EO_BASE_SUB_ID_EVENT_CALLBACK_CALL
EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD
EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL
EO_BASE_SUB_ID_EVENT_FREEZE
EO_BASE_SUB_ID_EVENT_THAW
EO_BASE_SUB_ID_EVENT_FREEZE_GET
EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE
EO_BASE_SUB_ID_EVENT_GLOBAL_THAW
EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET
EO_BASE_SUB_ID_DBG_INFO_GET
EO_BASE_SUB_ID_LAST
#cdef enum:
# EO_BASE_SUB_ID_CONSTRUCTOR
# EO_BASE_SUB_ID_DESTRUCTOR
# EO_BASE_SUB_ID_PARENT_SET
# EO_BASE_SUB_ID_PARENT_GET
# EO_BASE_SUB_ID_CHILDREN_ITERATOR_NEW
# EO_BASE_SUB_ID_DATA_SET
# EO_BASE_SUB_ID_DATA_GET
# EO_BASE_SUB_ID_DATA_DEL
# EO_BASE_SUB_ID_WREF_ADD
# EO_BASE_SUB_ID_WREF_DEL
# EO_BASE_SUB_ID_EVENT_CALLBACK_PRIORITY_ADD
# EO_BASE_SUB_ID_EVENT_CALLBACK_DEL
# EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_PRIORITY_ADD
# EO_BASE_SUB_ID_EVENT_CALLBACK_ARRAY_DEL
# EO_BASE_SUB_ID_EVENT_CALLBACK_CALL
# EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_ADD
# EO_BASE_SUB_ID_EVENT_CALLBACK_FORWARDER_DEL
# EO_BASE_SUB_ID_EVENT_FREEZE
# EO_BASE_SUB_ID_EVENT_THAW
# EO_BASE_SUB_ID_EVENT_FREEZE_GET
# EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE
# EO_BASE_SUB_ID_EVENT_GLOBAL_THAW
# EO_BASE_SUB_ID_EVENT_GLOBAL_FREEZE_GET
# EO_BASE_SUB_ID_DBG_INFO_GET
# EO_BASE_SUB_ID_LAST
cdef enum:
EO_CALLBACK_PRIORITY_BEFORE
EO_CALLBACK_PRIORITY_DEFAULT
EO_CALLBACK_PRIORITY_AFTER
EFL_CALLBACK_PRIORITY_BEFORE
EFL_CALLBACK_PRIORITY_DEFAULT
EFL_CALLBACK_PRIORITY_AFTER
####################################################################
# Structures
#
ctypedef struct Eo
ctypedef Eo Eo_Base
ctypedef Eo Efl_Object
ctypedef struct Eo_Class
ctypedef Eo Efl_Class
ctypedef struct _Eo_Event_Description:
ctypedef struct _Efl_Event_Description:
const char *name # name of the event.
Eina_Bool unfreezable # Eina_True if the event cannot be frozen.
Eina_Bool legacy_is # Internal use: if is a legacy event.
ctypedef _Eo_Event_Description Eo_Event_Description
ctypedef _Efl_Event_Description Efl_Event_Description
ctypedef struct _Eo_Event:
Eo_Base *obj # The object the event was called on. */
const Eo_Event_Description *desc # The event description. */
Efl_Object *obj # The object the event was called on. */
const Efl_Event_Description *desc # The event description. */
void *event_info # Extra event information passed by the event caller. */
ctypedef _Eo_Event Eo_Event
@ -80,55 +80,55 @@ cdef extern from "Eo.h":
# Eo Events
#
cdef const Eo_Event_Description *EO_EVENT_DEL
cdef const Efl_Event_Description *EFL_EVENT_DEL
####################################################################
# Other typedefs
#
ctypedef void (*Eo_Event_Cb)(void *data, const Eo_Event *event)
ctypedef void (*Efl_Event_Cb)(void *data, const Eo_Event *event)
ctypedef void (*eo_key_data_free_func)(void *)
ctypedef void (*efl_key_data_free_func)(void *)
####################################################################
# Functions
#
int eo_init()
int eo_shutdown()
int efl_object_init()
int efl_object_shutdown()
Eo *eo_add(const Eo_Class *klass, Eo *parent, ...)
void eo_del(const Eo *obj)
Eo *eo_ref(const Eo *obj)
void eo_unref(const Eo *obj)
int eo_ref_get(const Eo *obj)
Eo *efl_add(const Efl_Class *klass, Eo *parent, ...)
void efl_del(const Eo *obj)
Eo *efl_ref(const Eo *obj)
void efl_unref(const Eo *obj)
int efl_ref_get(const Eo *obj)
void eo_wref_add(Eo **wref)
void efl_wref_add(Eo **wref)
const Eo_Class *eo_base_class_get()
const Efl_Class *efl_object_class_get()
void eo_key_data_set(Eo *obj, const char *key, const void *data)
void *eo_key_data_get(Eo *obj, const char *key)
void efl_key_data_set(Eo *obj, const char *key, const void *data)
void *efl_key_data_get(Eo *obj, const char *key)
const Eo_Class *eo_class_get(const Eo *obj)
const char *eo_class_name_get(const Eo_Class *klass)
const Efl_Class *efl_class_get(const Eo *obj)
const char *efl_class_name_get(const Efl_Class *klass)
void eo_parent_set(Eo *obj, Eo *parent)
Eo *eo_parent_get(const Eo *obj)
void efl_parent_set(Eo *obj, Eo *parent)
Eo *efl_parent_get(const Eo *obj)
void eo_event_callback_stop(Eo *obj)
void eo_event_callback_forwarder_add(Eo *obj, const Eo_Event_Description *desc, Eo *new_obj)
void eo_event_callback_forwarder_del(Eo *obj, const Eo_Event_Description *desc, Eo *new_obj)
void efl_event_callback_stop(Eo *obj)
void efl_event_callback_forwarder_add(Eo *obj, const Efl_Event_Description *desc, Eo *new_obj)
void efl_event_callback_forwarder_del(Eo *obj, const Efl_Event_Description *desc, Eo *new_obj)
void eo_event_freeze(Eo *obj)
void eo_event_thaw(Eo *obj)
int eo_event_freeze_count_get(const Eo *obj)
void efl_event_freeze(Eo *obj)
void efl_event_thaw(Eo *obj)
int efl_event_freeze_count_get(const Eo *obj)
void eo_event_global_freeze(Eo *obj)
void eo_event_global_thaw(Eo *obj)
int eo_event_global_freeze_count_get(const Eo *obj)
void efl_event_global_freeze(Eo *obj)
void efl_event_global_thaw(Eo *obj)
int efl_event_global_freeze_count_get(const Eo *obj)
Eina_Bool eo_event_callback_add(Eo *obj, const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data)
Eina_Bool eo_event_callback_del(Eo *obj, const Eo_Event_Description *desc, Eo_Event_Cb cb, const void *data)
Eina_Bool efl_event_callback_add(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb cb, const void *data)
Eina_Bool efl_event_callback_del(Eo *obj, const Efl_Event_Description *desc, Efl_Event_Cb cb, const void *data)
Eina_Iterator * eo_children_iterator_new(Eo *obj)
Eina_Iterator * efl_children_iterator_new(Eo *obj)

20
include/efl.evas.pxd
View File

@ -18,7 +18,7 @@
from cpython cimport PyObject
from efl.eina cimport *
from efl.eo cimport Eo
from efl.c_eo cimport Eo as cEo, Eo_Class
from efl.c_eo cimport Eo as cEo, Efl_Class
from efl.evas.enums cimport Evas_Button_Flags, Evas_BiDi_Direction, \
Evas_Callback_Type, Evas_Event_Flags, Evas_Touch_Point_State, \
@ -304,7 +304,7 @@ cdef extern from "Evas.h":
Evas *evas_new()
void evas_free(Evas *e)
const Eo_Class *evas_class_get()
const Efl_Class *evas_class_get()
int evas_render_method_lookup(const char *name)
Eina_List *evas_render_method_list()
@ -516,7 +516,7 @@ cdef extern from "Evas.h":
void evas_smart_free(Evas_Smart *s)
Evas_Smart *evas_smart_class_new(Evas_Smart_Class *sc)
Evas_Smart_Class *evas_smart_class_get(Evas_Smart *s)
const Eo_Class *evas_object_smart_class_get()
const Efl_Class *evas_object_smart_class_get()
const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count)
const Evas_Smart_Cb_Description *evas_smart_callback_description_find(const Evas_Smart *s, const char *name)
@ -550,7 +550,7 @@ cdef extern from "Evas.h":
# Rectangle Object
#
Evas_Object *evas_object_rectangle_add(Evas *e)
const Eo_Class *evas_object_rectangle_class_get()
const Efl_Class *evas_object_rectangle_class_get()
####################################################################
@ -559,7 +559,7 @@ cdef extern from "Evas.h":
Evas_Object *evas_object_line_add(Evas *e)
void evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
void evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2)
const Eo_Class *evas_object_line_class_get()
const Efl_Class *evas_object_line_class_get()
####################################################################
@ -568,7 +568,7 @@ cdef extern from "Evas.h":
Evas_Object *evas_object_image_add(Evas *e)
# TODO: Use this?: Evas_Object *evas_object_image_filled_add(Evas *e)
# TODO: void evas_object_image_memfile_set(Evas_Object *obj, void *data, int size, char *format, char *key)
# TODO: Is this needed?: const Eo_Class *evas_object_image_class_get()
# TODO: Is this needed?: const Efl_Class *evas_object_image_class_get()
void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key)
void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
@ -647,7 +647,7 @@ cdef extern from "Evas.h":
# Polygon Object
#
Evas_Object *evas_object_polygon_add(Evas *e)
const Eo_Class *evas_object_polygon_class_get()
const Efl_Class *evas_object_polygon_class_get()
void evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
void evas_object_polygon_points_clear(Evas_Object *obj)
@ -656,7 +656,7 @@ cdef extern from "Evas.h":
# Text Object (py3:TODO)
#
Evas_Object *evas_object_text_add(Evas *e)
const Eo_Class *evas_object_text_class_get()
const Efl_Class *evas_object_text_class_get()
void evas_object_text_font_source_set(Evas_Object *obj, const char *font)
const char *evas_object_text_font_source_get(const Evas_Object *obj)
void evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size)
@ -689,7 +689,7 @@ cdef extern from "Evas.h":
# Textblock Object (py3:TODO)
#
Evas_Object *evas_object_textblock_add(Evas *e)
const Eo_Class *evas_object_textblock_class_get()
const Efl_Class *evas_object_textblock_class_get()
Evas_Textblock_Style *evas_textblock_style_new()
void evas_textblock_style_free(Evas_Textblock_Style *ts)
void evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
@ -753,7 +753,7 @@ cdef extern from "Evas.h":
#
Evas_Object *evas_object_box_add(Evas *e)
Evas_Object *evas_object_box_add_to(Evas_Object *parent)
# TODO: Is this needed?: const Eo_Class *evas_object_box_class_get()
# TODO: Is this needed?: const Efl_Class *evas_object_box_class_get()
void evas_object_box_align_set(Evas_Object *o, double horizontal, double vertical)
void evas_object_box_align_get(const Evas_Object *o, double *horizontal, double *vertical)