summaryrefslogtreecommitdiff
path: root/efl
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2015-01-04 20:44:45 +0100
committerDave Andreoli <dave@gurumeditation.it>2015-01-04 20:44:45 +0100
commitf9e890672447aea2f1b9dcdd945ecaff304037e8 (patch)
treeac71cc7929821d78a2e1c8c089e6780920e8a120 /efl
parent3f064401a159f362dbe6d53b77ea0fec66eb5d3c (diff)
Use new cython cpdef-enums in evas
cpdef enums are automatically exported to C and to python, no more need for the enums file and the duplicated definition for py. This is a cython 0.21 feature so from now on you will need at least that version. Require some <int> cast here and there, but a totally win in the end.
Diffstat (limited to 'efl')
-rw-r--r--efl/elementary/general.pxd2
-rw-r--r--efl/elementary/object.pxd8
-rw-r--r--efl/elementary/object.pyx19
-rw-r--r--efl/elementary/photocam.pxd3
-rw-r--r--efl/evas/efl.evas.pyx147
-rw-r--r--efl/evas/efl.evas_canvas_callbacks.pxi68
-rw-r--r--efl/evas/efl.evas_object.pxi87
-rw-r--r--efl/evas/efl.evas_object_callbacks.pxi68
-rw-r--r--efl/evas/efl.evas_object_textgrid.pxi9
9 files changed, 132 insertions, 279 deletions
diff --git a/efl/elementary/general.pxd b/efl/elementary/general.pxd
index df75bac..2957337 100644
--- a/efl/elementary/general.pxd
+++ b/efl/elementary/general.pxd
@@ -18,7 +18,7 @@
18 18
19from efl.evas cimport Eina_List, Eina_Bool 19from efl.evas cimport Eina_List, Eina_Bool
20from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord 20from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord
21from efl.evas.enums cimport Evas_Callback_Type 21from efl.evas cimport Evas_Callback_Type
22from enums cimport Elm_Sys_Notify_Closed_Reason, Elm_Sys_Notify_Urgency, \ 22from enums cimport Elm_Sys_Notify_Closed_Reason, Elm_Sys_Notify_Urgency, \
23 Elm_Process_State 23 Elm_Process_State
24 24
diff --git a/efl/elementary/object.pxd b/efl/elementary/object.pxd
index 682ede7..475d661 100644
--- a/efl/elementary/object.pxd
+++ b/efl/elementary/object.pxd
@@ -15,11 +15,9 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18from efl.evas cimport Eina_Bool, Eina_List, \ 18from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Smart_Cb, \
19 Evas_Object, Evas_Smart_Cb, Evas_Coord 19 Evas_Coord, Evas_Callback_Type, Object as evasObject, Canvas as evasCanvas
20from efl.evas.enums cimport Evas_Callback_Type 20
21from efl.evas cimport Object as evasObject
22from efl.evas cimport Canvas as evasCanvas
23from enums cimport Elm_Focus_Direction, Elm_Sel_Format, Elm_Sel_Type, \ 21from enums cimport Elm_Focus_Direction, Elm_Sel_Format, Elm_Sel_Type, \
24 Elm_Xdnd_Action 22 Elm_Xdnd_Action
25 23
diff --git a/efl/elementary/object.pyx b/efl/elementary/object.pyx
index 3c45ba4..af26829 100644
--- a/efl/elementary/object.pyx
+++ b/efl/elementary/object.pyx
@@ -267,9 +267,11 @@ from libc.stdint cimport uintptr_t
267from efl.eo cimport _object_mapping_register 267from efl.eo cimport _object_mapping_register
268from efl.utils.conversions cimport _ctouni, eina_list_objects_to_python_list 268from efl.utils.conversions cimport _ctouni, eina_list_objects_to_python_list
269from efl.utils.deprecated cimport DEPRECATED 269from efl.utils.deprecated cimport DEPRECATED
270from efl.evas cimport Object as evasObject 270from efl.evas cimport Object as evasObject, \
271from efl.evas cimport EventKeyDown, EventKeyUp, EventMouseWheel, \ 271 EventKeyDown, EventKeyUp, EventMouseWheel, \
272 evas_object_smart_callback_add, evas_object_smart_callback_del 272 evas_object_smart_callback_add, evas_object_smart_callback_del, \
273 Evas_Callback_Type, EVAS_CALLBACK_KEY_DOWN, EVAS_CALLBACK_KEY_UP, \
274 EVAS_CALLBACK_MOUSE_WHEEL
273 275
274include "cnp_callbacks.pxi" 276include "cnp_callbacks.pxi"
275include "tooltips.pxi" 277include "tooltips.pxi"
@@ -280,7 +282,6 @@ import logging
280log = logging.getLogger("elementary") 282log = logging.getLogger("elementary")
281import traceback 283import traceback
282 284
283cimport efl.evas.enums as evasenums
284cimport enums 285cimport enums
285 286
286ELM_FOCUS_PREVIOUS = enums.ELM_FOCUS_PREVIOUS 287ELM_FOCUS_PREVIOUS = enums.ELM_FOCUS_PREVIOUS
@@ -297,10 +298,6 @@ ELM_FOCUS_AUTOSCROLL_MODE_SHOW = enums.ELM_FOCUS_AUTOSCROLL_MODE_SHOW
297ELM_FOCUS_AUTOSCROLL_MODE_NONE = enums.ELM_FOCUS_AUTOSCROLL_MODE_NONE 298ELM_FOCUS_AUTOSCROLL_MODE_NONE = enums.ELM_FOCUS_AUTOSCROLL_MODE_NONE
298ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN = enums.ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN 299ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN = enums.ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN
299 300
300EVAS_CALLBACK_KEY_DOWN = evasenums.EVAS_CALLBACK_KEY_DOWN
301EVAS_CALLBACK_KEY_UP = evasenums.EVAS_CALLBACK_KEY_UP
302EVAS_CALLBACK_MOUSE_WHEEL = evasenums.EVAS_CALLBACK_MOUSE_WHEEL
303
304ELM_SEL_TYPE_PRIMARY = enums.ELM_SEL_TYPE_PRIMARY 301ELM_SEL_TYPE_PRIMARY = enums.ELM_SEL_TYPE_PRIMARY
305ELM_SEL_TYPE_SECONDARY = enums.ELM_SEL_TYPE_SECONDARY 302ELM_SEL_TYPE_SECONDARY = enums.ELM_SEL_TYPE_SECONDARY
306ELM_SEL_TYPE_XDND = enums.ELM_SEL_TYPE_XDND 303ELM_SEL_TYPE_XDND = enums.ELM_SEL_TYPE_XDND
@@ -367,17 +364,17 @@ cdef Eina_Bool _event_callback(void *data, Evas_Object *o, \
367 EventKeyDown down_event 364 EventKeyDown down_event
368 EventKeyUp up_event 365 EventKeyUp up_event
369 366
370 if t == evasenums.EVAS_CALLBACK_KEY_DOWN: 367 if t == <int>EVAS_CALLBACK_KEY_DOWN:
371 down_event = EventKeyDown() 368 down_event = EventKeyDown()
372 down_event._set_obj(event_info) 369 down_event._set_obj(event_info)
373 ret = _event_dispatcher(obj, src_obj, t, down_event) 370 ret = _event_dispatcher(obj, src_obj, t, down_event)
374 down_event._unset_obj() 371 down_event._unset_obj()
375 elif t == evasenums.EVAS_CALLBACK_KEY_UP: 372 elif t == <int>EVAS_CALLBACK_KEY_UP:
376 up_event = EventKeyUp() 373 up_event = EventKeyUp()
377 up_event._set_obj(event_info) 374 up_event._set_obj(event_info)
378 ret = _event_dispatcher(obj, src_obj, t, up_event) 375 ret = _event_dispatcher(obj, src_obj, t, up_event)
379 up_event._unset_obj() 376 up_event._unset_obj()
380 elif t == evasenums.EVAS_CALLBACK_MOUSE_WHEEL: 377 elif t == <int>EVAS_CALLBACK_MOUSE_WHEEL:
381 wheel_event = EventMouseWheel() 378 wheel_event = EventMouseWheel()
382 wheel_event._set_obj(event_info) 379 wheel_event._set_obj(event_info)
383 ret = _event_dispatcher(obj, src_obj, t, wheel_event) 380 ret = _event_dispatcher(obj, src_obj, t, wheel_event)
diff --git a/efl/elementary/photocam.pxd b/efl/elementary/photocam.pxd
index ec3d31a..739c5bb 100644
--- a/efl/elementary/photocam.pxd
+++ b/efl/elementary/photocam.pxd
@@ -1,5 +1,4 @@
1from efl.evas cimport Eina_Bool, Evas_Object 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Load_Error
2from efl.evas.enums cimport Evas_Load_Error
3from enums cimport Elm_Photocam_Zoom_Mode 2from enums cimport Elm_Photocam_Zoom_Mode
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
diff --git a/efl/evas/efl.evas.pyx b/efl/evas/efl.evas.pyx
index edd12f4..2544a63 100644
--- a/efl/evas/efl.evas.pyx
+++ b/efl/evas/efl.evas.pyx
@@ -15,145 +15,12 @@
15# You should have received a copy of the GNU Lesser General Public License 15# You should have received a copy of the GNU Lesser General Public License
16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>. 16# along with this Python-EFL. If not, see <http://www.gnu.org/licenses/>.
17 17
18cimport efl.evas.enums as enums
19from efl.utils.conversions cimport eina_list_strings_to_python_list 18from efl.utils.conversions cimport eina_list_strings_to_python_list
20from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, EINA_LOG_DOM_WARN 19from efl.eina cimport EINA_LOG_DOM_DBG, EINA_LOG_DOM_INFO, EINA_LOG_DOM_WARN
21from efl.utils.logger cimport add_logger 20from efl.utils.logger cimport add_logger
22 21
23cdef int PY_EFL_EVAS_LOG_DOMAIN = add_logger(__name__).eina_log_domain 22cdef int PY_EFL_EVAS_LOG_DOMAIN = add_logger(__name__).eina_log_domain
24 23
25EVAS_LAYER_MIN = enums.EVAS_LAYER_MIN
26EVAS_LAYER_MAX = enums.EVAS_LAYER_MAX
27
28EVAS_HINT_EXPAND = 1.0
29EVAS_HINT_FILL = -1.0
30
31EVAS_CALLBACK_MOUSE_IN = enums.EVAS_CALLBACK_MOUSE_IN
32EVAS_CALLBACK_MOUSE_OUT = enums.EVAS_CALLBACK_MOUSE_OUT
33EVAS_CALLBACK_MOUSE_DOWN = enums.EVAS_CALLBACK_MOUSE_DOWN
34EVAS_CALLBACK_MOUSE_UP = enums.EVAS_CALLBACK_MOUSE_UP
35EVAS_CALLBACK_MOUSE_MOVE = enums.EVAS_CALLBACK_MOUSE_MOVE
36EVAS_CALLBACK_MOUSE_WHEEL = enums.EVAS_CALLBACK_MOUSE_WHEEL
37EVAS_CALLBACK_MULTI_DOWN = enums.EVAS_CALLBACK_MULTI_DOWN
38EVAS_CALLBACK_MULTI_UP = enums.EVAS_CALLBACK_MULTI_UP
39EVAS_CALLBACK_MULTI_MOVE = enums.EVAS_CALLBACK_MULTI_MOVE
40EVAS_CALLBACK_FREE = enums.EVAS_CALLBACK_FREE
41EVAS_CALLBACK_KEY_DOWN = enums.EVAS_CALLBACK_KEY_DOWN
42EVAS_CALLBACK_KEY_UP = enums.EVAS_CALLBACK_KEY_UP
43EVAS_CALLBACK_FOCUS_IN = enums.EVAS_CALLBACK_FOCUS_IN
44EVAS_CALLBACK_FOCUS_OUT = enums.EVAS_CALLBACK_FOCUS_OUT
45EVAS_CALLBACK_SHOW = enums.EVAS_CALLBACK_SHOW
46EVAS_CALLBACK_HIDE = enums.EVAS_CALLBACK_HIDE
47EVAS_CALLBACK_MOVE = enums.EVAS_CALLBACK_MOVE
48EVAS_CALLBACK_RESIZE = enums.EVAS_CALLBACK_RESIZE
49EVAS_CALLBACK_RESTACK = enums.EVAS_CALLBACK_RESTACK
50EVAS_CALLBACK_DEL = enums.EVAS_CALLBACK_DEL
51EVAS_CALLBACK_HOLD = enums.EVAS_CALLBACK_HOLD
52EVAS_CALLBACK_CHANGED_SIZE_HINTS = enums.EVAS_CALLBACK_CHANGED_SIZE_HINTS
53EVAS_CALLBACK_IMAGE_PRELOADED = enums.EVAS_CALLBACK_IMAGE_PRELOADED
54EVAS_CALLBACK_CANVAS_FOCUS_IN = enums.EVAS_CALLBACK_CANVAS_FOCUS_IN
55EVAS_CALLBACK_CANVAS_FOCUS_OUT = enums.EVAS_CALLBACK_CANVAS_FOCUS_OUT
56EVAS_CALLBACK_RENDER_FLUSH_PRE = enums.EVAS_CALLBACK_RENDER_FLUSH_PRE
57EVAS_CALLBACK_RENDER_FLUSH_POST = enums.EVAS_CALLBACK_RENDER_FLUSH_POST
58EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN = enums.EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN
59EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT = enums.EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT
60EVAS_CALLBACK_IMAGE_UNLOADED = enums.EVAS_CALLBACK_IMAGE_UNLOADED
61EVAS_CALLBACK_RENDER_PRE = enums.EVAS_CALLBACK_RENDER_PRE
62EVAS_CALLBACK_RENDER_POST = enums.EVAS_CALLBACK_RENDER_POST
63EVAS_CALLBACK_IMAGE_RESIZE = enums.EVAS_CALLBACK_IMAGE_RESIZE
64EVAS_CALLBACK_DEVICE_CHANGED = enums.EVAS_CALLBACK_DEVICE_CHANGED
65EVAS_CALLBACK_LAST = enums.EVAS_CALLBACK_LAST
66
67EVAS_BUTTON_NONE = enums.EVAS_BUTTON_NONE
68EVAS_BUTTON_DOUBLE_CLICK = enums.EVAS_BUTTON_DOUBLE_CLICK
69EVAS_BUTTON_TRIPLE_CLICK = enums.EVAS_BUTTON_TRIPLE_CLICK
70
71EVAS_EVENT_FLAG_NONE = enums.EVAS_EVENT_FLAG_NONE
72EVAS_EVENT_FLAG_ON_HOLD = enums.EVAS_EVENT_FLAG_ON_HOLD
73
74EVAS_RENDER_BLEND = enums.EVAS_RENDER_BLEND
75EVAS_RENDER_BLEND_REL = enums.EVAS_RENDER_BLEND_REL
76EVAS_RENDER_COPY = enums.EVAS_RENDER_COPY
77EVAS_RENDER_COPY_REL = enums.EVAS_RENDER_COPY_REL
78EVAS_RENDER_ADD = enums.EVAS_RENDER_ADD
79EVAS_RENDER_ADD_REL = enums.EVAS_RENDER_ADD_REL
80EVAS_RENDER_SUB = enums.EVAS_RENDER_SUB
81EVAS_RENDER_SUB_REL = enums.EVAS_RENDER_SUB_REL
82EVAS_RENDER_TINT = enums.EVAS_RENDER_TINT
83EVAS_RENDER_TINT_REL = enums.EVAS_RENDER_TINT_REL
84EVAS_RENDER_MASK = enums.EVAS_RENDER_MASK
85EVAS_RENDER_MUL = enums.EVAS_RENDER_MUL
86
87EVAS_TEXTURE_REFLECT = enums.EVAS_TEXTURE_REFLECT
88EVAS_TEXTURE_REPEAT = enums.EVAS_TEXTURE_REPEAT
89EVAS_TEXTURE_RESTRICT = enums.EVAS_TEXTURE_RESTRICT
90EVAS_TEXTURE_RESTRICT_REFLECT = enums.EVAS_TEXTURE_RESTRICT_REFLECT
91EVAS_TEXTURE_RESTRICT_REPEAT = enums.EVAS_TEXTURE_RESTRICT_REPEAT
92EVAS_TEXTURE_PAD = enums.EVAS_TEXTURE_PAD
93
94EVAS_ALLOC_ERROR_NONE = enums.EVAS_ALLOC_ERROR_NONE
95EVAS_ALLOC_ERROR_FATAL = enums.EVAS_ALLOC_ERROR_FATAL
96EVAS_ALLOC_ERROR_RECOVERED = enums.EVAS_ALLOC_ERROR_RECOVERED
97
98EVAS_LOAD_ERROR_NONE = enums.EVAS_LOAD_ERROR_NONE
99EVAS_LOAD_ERROR_GENERIC = enums.EVAS_LOAD_ERROR_GENERIC
100EVAS_LOAD_ERROR_DOES_NOT_EXIST = enums.EVAS_LOAD_ERROR_DOES_NOT_EXIST
101EVAS_LOAD_ERROR_PERMISSION_DENIED = enums.EVAS_LOAD_ERROR_PERMISSION_DENIED
102EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = enums.EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED
103EVAS_LOAD_ERROR_CORRUPT_FILE = enums.EVAS_LOAD_ERROR_CORRUPT_FILE
104EVAS_LOAD_ERROR_UNKNOWN_FORMAT = enums.EVAS_LOAD_ERROR_UNKNOWN_FORMAT
105
106EVAS_COLOR_SPACE_ARGB = enums.EVAS_COLOR_SPACE_ARGB
107EVAS_COLOR_SPACE_AHSV = enums.EVAS_COLOR_SPACE_AHSV
108
109EVAS_COLORSPACE_ARGB8888 = enums.EVAS_COLORSPACE_ARGB8888
110EVAS_COLORSPACE_YCBCR422P601_PL = enums.EVAS_COLORSPACE_YCBCR422P601_PL
111EVAS_COLORSPACE_YCBCR422P709_PL = enums.EVAS_COLORSPACE_YCBCR422P709_PL
112EVAS_COLORSPACE_RGB565_A5P = enums.EVAS_COLORSPACE_RGB565_A5P
113
114EVAS_PIXEL_FORMAT_NONE = enums.EVAS_PIXEL_FORMAT_NONE
115EVAS_PIXEL_FORMAT_ARGB32 = enums.EVAS_PIXEL_FORMAT_ARGB32
116EVAS_PIXEL_FORMAT_YUV420P_601 = enums.EVAS_PIXEL_FORMAT_YUV420P_601
117
118EVAS_FONT_HINTING_NONE = enums.EVAS_FONT_HINTING_NONE
119EVAS_FONT_HINTING_AUTO = enums.EVAS_FONT_HINTING_AUTO
120EVAS_FONT_HINTING_BYTECODE = enums.EVAS_FONT_HINTING_BYTECODE
121
122EVAS_TEXT_STYLE_PLAIN = enums.EVAS_TEXT_STYLE_PLAIN
123EVAS_TEXT_STYLE_SHADOW = enums.EVAS_TEXT_STYLE_SHADOW
124EVAS_TEXT_STYLE_OUTLINE = enums.EVAS_TEXT_STYLE_OUTLINE
125EVAS_TEXT_STYLE_SOFT_OUTLINE = enums.EVAS_TEXT_STYLE_SOFT_OUTLINE
126EVAS_TEXT_STYLE_GLOW = enums.EVAS_TEXT_STYLE_GLOW
127EVAS_TEXT_STYLE_OUTLINE_SHADOW = enums.EVAS_TEXT_STYLE_OUTLINE_SHADOW
128EVAS_TEXT_STYLE_FAR_SHADOW = enums.EVAS_TEXT_STYLE_FAR_SHADOW
129EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW
130EVAS_TEXT_STYLE_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_SOFT_SHADOW
131EVAS_TEXT_STYLE_FAR_SOFT_SHADOW = enums.EVAS_TEXT_STYLE_FAR_SOFT_SHADOW
132
133EVAS_TEXT_INVALID = enums.EVAS_TEXT_INVALID
134EVAS_TEXT_SPECIAL = enums.EVAS_TEXT_SPECIAL
135
136EVAS_TEXTBLOCK_TEXT_RAW = enums.EVAS_TEXTBLOCK_TEXT_RAW
137EVAS_TEXTBLOCK_TEXT_PLAIN = enums.EVAS_TEXTBLOCK_TEXT_PLAIN
138
139EVAS_OBJECT_POINTER_MODE_AUTOGRAB = enums.EVAS_OBJECT_POINTER_MODE_AUTOGRAB
140EVAS_OBJECT_POINTER_MODE_NOGRAB = enums.EVAS_OBJECT_POINTER_MODE_NOGRAB
141
142# FIXME: These were used with the image rotation functions removed earlier.
143# Are they needed anymore?
144#
145# EVAS_IMAGE_ROTATE_NONE = 0
146# EVAS_IMAGE_ROTATE_90 = 1
147# EVAS_IMAGE_ROTATE_180 = 2
148# EVAS_IMAGE_ROTATE_270 = 3
149
150EVAS_ASPECT_CONTROL_NONE = enums.EVAS_ASPECT_CONTROL_NONE
151EVAS_ASPECT_CONTROL_NEITHER = enums.EVAS_ASPECT_CONTROL_NEITHER
152EVAS_ASPECT_CONTROL_HORIZONTAL = enums.EVAS_ASPECT_CONTROL_HORIZONTAL
153EVAS_ASPECT_CONTROL_VERTICAL = enums.EVAS_ASPECT_CONTROL_VERTICAL
154EVAS_ASPECT_CONTROL_BOTH = enums.EVAS_ASPECT_CONTROL_BOTH
155
156EVAS_SMART_CLASS_VERSION = enums.EVAS_SMART_CLASS_VERSION
157 24
158def init(): 25def init():
159 EINA_LOG_DOM_INFO(PY_EFL_EVAS_LOG_DOMAIN, "Initializing efl.evas", NULL) 26 EINA_LOG_DOM_INFO(PY_EFL_EVAS_LOG_DOMAIN, "Initializing efl.evas", NULL)
@@ -323,19 +190,19 @@ def font_path_global_list():
323 190
324class EvasLoadError(Exception): 191class EvasLoadError(Exception):
325 def __init__(self, int code, filename, key): 192 def __init__(self, int code, filename, key):
326 if code == enums.EVAS_LOAD_ERROR_NONE: 193 if code == EVAS_LOAD_ERROR_NONE:
327 msg = "No error on load" 194 msg = "No error on load"
328 elif code == enums.EVAS_LOAD_ERROR_GENERIC: 195 elif code == EVAS_LOAD_ERROR_GENERIC:
329 msg = "A non-specific error occurred" 196 msg = "A non-specific error occurred"
330 elif code == enums.EVAS_LOAD_ERROR_DOES_NOT_EXIST: 197 elif code == EVAS_LOAD_ERROR_DOES_NOT_EXIST:
331 msg = "File (or file path) does not exist" 198 msg = "File (or file path) does not exist"
332 elif code == enums.EVAS_LOAD_ERROR_PERMISSION_DENIED: 199 elif code == EVAS_LOAD_ERROR_PERMISSION_DENIED:
333 msg = "Permission denied to an existing file (or path)" 200 msg = "Permission denied to an existing file (or path)"
334 elif code == enums.EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: 201 elif code == EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
335 msg = "Allocation of resources failure prevented load" 202 msg = "Allocation of resources failure prevented load"
336 elif code == enums.EVAS_LOAD_ERROR_CORRUPT_FILE: 203 elif code == EVAS_LOAD_ERROR_CORRUPT_FILE:
337 msg = "File corrupt (but was detected as a known format)" 204 msg = "File corrupt (but was detected as a known format)"
338 elif code == enums.EVAS_LOAD_ERROR_UNKNOWN_FORMAT: 205 elif code == EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
339 msg = "File is not in a known format" 206 msg = "File is not in a known format"
340 self.code = code 207 self.code = code
341 self.file = filename 208 self.file = filename
diff --git a/efl/evas/efl.evas_canvas_callbacks.pxi b/efl/evas/efl.evas_canvas_callbacks.pxi
index 6d11cf7..2901158 100644
--- a/efl/evas/efl.evas_canvas_callbacks.pxi
+++ b/efl/evas/efl.evas_canvas_callbacks.pxi
@@ -162,37 +162,37 @@ cdef void cb_canvas_render_post(void *data, Evas *e, void *e_inf) with gil:
162cdef int evas_canvas_event_callbacks_len 162cdef int evas_canvas_event_callbacks_len
163cdef Evas_Event_Cb evas_canvas_event_callbacks[34] 163cdef Evas_Event_Cb evas_canvas_event_callbacks[34]
164evas_canvas_event_callbacks_len = 34 164evas_canvas_event_callbacks_len = 34
165evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in 165evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in
166evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out 166evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out
167evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down 167evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down
168evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_UP] = cb_canvas_mouse_up 168evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_UP] = cb_canvas_mouse_up
169evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_MOVE] = cb_canvas_mouse_move 169evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_MOVE] = cb_canvas_mouse_move
170evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_WHEEL] = cb_canvas_mouse_wheel 170evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOUSE_WHEEL] = cb_canvas_mouse_wheel
171evas_canvas_event_callbacks[EVAS_CALLBACK_MULTI_DOWN] = cb_canvas_multi_down 171evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MULTI_DOWN] = cb_canvas_multi_down
172evas_canvas_event_callbacks[EVAS_CALLBACK_MULTI_UP] = cb_canvas_multi_up 172evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MULTI_UP] = cb_canvas_multi_up
173evas_canvas_event_callbacks[EVAS_CALLBACK_MULTI_MOVE] = cb_canvas_multi_move 173evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MULTI_MOVE] = cb_canvas_multi_move
174evas_canvas_event_callbacks[EVAS_CALLBACK_FREE] = cb_canvas_free 174evas_canvas_event_callbacks[<int>EVAS_CALLBACK_FREE] = cb_canvas_free
175evas_canvas_event_callbacks[EVAS_CALLBACK_KEY_DOWN] = cb_canvas_key_down 175evas_canvas_event_callbacks[<int>EVAS_CALLBACK_KEY_DOWN] = cb_canvas_key_down
176evas_canvas_event_callbacks[EVAS_CALLBACK_KEY_UP] = cb_canvas_key_up 176evas_canvas_event_callbacks[<int>EVAS_CALLBACK_KEY_UP] = cb_canvas_key_up
177evas_canvas_event_callbacks[EVAS_CALLBACK_FOCUS_IN] = cb_canvas_focus_in 177evas_canvas_event_callbacks[<int>EVAS_CALLBACK_FOCUS_IN] = cb_canvas_focus_in
178evas_canvas_event_callbacks[EVAS_CALLBACK_FOCUS_OUT] = cb_canvas_focus_out 178evas_canvas_event_callbacks[<int>EVAS_CALLBACK_FOCUS_OUT] = cb_canvas_focus_out
179evas_canvas_event_callbacks[EVAS_CALLBACK_SHOW] = cb_canvas_show 179evas_canvas_event_callbacks[<int>EVAS_CALLBACK_SHOW] = cb_canvas_show
180evas_canvas_event_callbacks[EVAS_CALLBACK_HIDE] = cb_canvas_hide 180evas_canvas_event_callbacks[<int>EVAS_CALLBACK_HIDE] = cb_canvas_hide
181evas_canvas_event_callbacks[EVAS_CALLBACK_MOVE] = cb_canvas_move 181evas_canvas_event_callbacks[<int>EVAS_CALLBACK_MOVE] = cb_canvas_move
182evas_canvas_event_callbacks[EVAS_CALLBACK_RESIZE] = cb_canvas_resize 182evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RESIZE] = cb_canvas_resize
183evas_canvas_event_callbacks[EVAS_CALLBACK_RESTACK] = cb_canvas_restack 183evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RESTACK] = cb_canvas_restack
184evas_canvas_event_callbacks[EVAS_CALLBACK_DEL] = cb_canvas_del 184evas_canvas_event_callbacks[<int>EVAS_CALLBACK_DEL] = cb_canvas_del
185evas_canvas_event_callbacks[EVAS_CALLBACK_HOLD] = cb_canvas_hold 185evas_canvas_event_callbacks[<int>EVAS_CALLBACK_HOLD] = cb_canvas_hold
186evas_canvas_event_callbacks[EVAS_CALLBACK_CHANGED_SIZE_HINTS] = cb_canvas_changed_size_hints 186evas_canvas_event_callbacks[<int>EVAS_CALLBACK_CHANGED_SIZE_HINTS] = cb_canvas_changed_size_hints
187evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_PRELOADED] = cb_canvas_image_preloaded 187evas_canvas_event_callbacks[<int>EVAS_CALLBACK_IMAGE_PRELOADED] = cb_canvas_image_preloaded
188evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_FOCUS_IN] = cb_canvas_canvas_focus_in 188evas_canvas_event_callbacks[<int>EVAS_CALLBACK_CANVAS_FOCUS_IN] = cb_canvas_canvas_focus_in
189evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_FOCUS_OUT] = cb_canvas_canvas_focus_out 189evas_canvas_event_callbacks[<int>EVAS_CALLBACK_CANVAS_FOCUS_OUT] = cb_canvas_canvas_focus_out
190evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_FLUSH_PRE] = cb_canvas_render_flush_pre 190evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RENDER_FLUSH_PRE] = cb_canvas_render_flush_pre
191evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_FLUSH_POST] = cb_canvas_render_flush_post 191evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RENDER_FLUSH_POST] = cb_canvas_render_flush_post
192evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN] = cb_canvas_canvas_object_focus_in 192evas_canvas_event_callbacks[<int>EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN] = cb_canvas_canvas_object_focus_in
193evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_canvas_canvas_object_focus_out 193evas_canvas_event_callbacks[<int>EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_canvas_canvas_object_focus_out
194evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded 194evas_canvas_event_callbacks[<int>EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded
195evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre 195evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre
196evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post 196evas_canvas_event_callbacks[<int>EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post
197evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_canvas_image_resize 197evas_canvas_event_callbacks[<int>EVAS_CALLBACK_IMAGE_RESIZE] = cb_canvas_image_resize
198evas_canvas_event_callbacks[EVAS_CALLBACK_DEVICE_CHANGED] = cb_canvas_device_changed 198evas_canvas_event_callbacks[<int>EVAS_CALLBACK_DEVICE_CHANGED] = cb_canvas_device_changed
diff --git a/efl/evas/efl.evas_object.pxi b/efl/evas/efl.evas_object.pxi
index 0e84e7a..a919499 100644
--- a/efl/evas/efl.evas_object.pxi
+++ b/efl/evas/efl.evas_object.pxi
@@ -36,7 +36,7 @@ cdef int _object_unregister_callbacks(Object obj) except 0:
36 cb = evas_object_event_callbacks[i] 36 cb = evas_object_event_callbacks[i]
37 evas_object_event_callback_del(o, i, cb) 37 evas_object_event_callback_del(o, i, cb)
38 38
39 evas_object_event_callback_del(o, enums.EVAS_CALLBACK_FREE, obj_free_cb) 39 evas_object_event_callback_del(o, EVAS_CALLBACK_FREE, obj_free_cb)
40 return 1 40 return 1
41 41
42 42
@@ -44,7 +44,8 @@ cdef void obj_free_cb(void *data, Evas *e,
44 Evas_Object *obj, void *event_info) with gil: 44 Evas_Object *obj, void *event_info) with gil:
45 cdef Object self = <Object>data 45 cdef Object self = <Object>data
46 46
47 lst = self._event_callbacks[enums.EVAS_CALLBACK_FREE] 47 lst = self._event_callbacks[<int>EVAS_CALLBACK_FREE]
48
48 if lst is not None: 49 if lst is not None:
49 for func, args, kargs in lst: 50 for func, args, kargs in lst:
50 try: 51 try:
@@ -195,7 +196,7 @@ cdef class Object(Eo):
195 196
196 cdef int _set_obj(self, Evas_Object *obj) except 0: 197 cdef int _set_obj(self, Evas_Object *obj) except 0:
197 Eo._set_obj(self, obj) 198 Eo._set_obj(self, obj)
198 evas_object_event_callback_add(obj, enums.EVAS_CALLBACK_FREE, 199 evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
199 obj_free_cb, <void *>self) 200 obj_free_cb, <void *>self)
200 Py_INCREF(self) 201 Py_INCREF(self)
201 202
@@ -1252,7 +1253,7 @@ cdef class Object(Eo):
1252 raise TypeError("func must be callable") 1253 raise TypeError("func must be callable")
1253 1254
1254 if _object_add_callback_to_list(self, type, func, args, kargs): 1255 if _object_add_callback_to_list(self, type, func, args, kargs):
1255 if type != enums.EVAS_CALLBACK_FREE: 1256 if <int>type != EVAS_CALLBACK_FREE:
1256 cb = evas_object_event_callbacks[<int>type] 1257 cb = evas_object_event_callbacks[<int>type]
1257 evas_object_event_callback_add(self.obj, type, cb, <void*>self) 1258 evas_object_event_callback_add(self.obj, type, cb, <void*>self)
1258 1259
@@ -1272,7 +1273,7 @@ cdef class Object(Eo):
1272 """ 1273 """
1273 cdef Evas_Object_Event_Cb cb 1274 cdef Evas_Object_Event_Cb cb
1274 if _object_del_callback_from_list(self, type, func): 1275 if _object_del_callback_from_list(self, type, func):
1275 if type != enums.EVAS_CALLBACK_FREE: 1276 if <int>type != EVAS_CALLBACK_FREE:
1276 cb = evas_object_event_callbacks[<int>type] 1277 cb = evas_object_event_callbacks[<int>type]
1277 evas_object_event_callback_del(self.obj, type, cb) 1278 evas_object_event_callback_del(self.obj, type, cb)
1278 1279
@@ -1283,11 +1284,11 @@ cdef class Object(Eo):
1283 1284
1284 function(object, event_info, *args, **kargs) 1285 function(object, event_info, *args, **kargs)
1285 """ 1286 """
1286 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_IN, func, *a, **k) 1287 self.event_callback_add(EVAS_CALLBACK_MOUSE_IN, func, *a, **k)
1287 1288
1288 def on_mouse_in_del(self, func): 1289 def on_mouse_in_del(self, func):
1289 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_IN, ...)""" 1290 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_IN, ...)"""
1290 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_IN, func) 1291 self.event_callback_del(EVAS_CALLBACK_MOUSE_IN, func)
1291 1292
1292 def on_mouse_out_add(self, func, *a, **k): 1293 def on_mouse_out_add(self, func, *a, **k):
1293 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_OUT, ...) 1294 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_OUT, ...)
@@ -1296,11 +1297,11 @@ cdef class Object(Eo):
1296 1297
1297 function(object, event_info, *args, **kargs) 1298 function(object, event_info, *args, **kargs)
1298 """ 1299 """
1299 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_OUT, func, *a, **k) 1300 self.event_callback_add(EVAS_CALLBACK_MOUSE_OUT, func, *a, **k)
1300 1301
1301 def on_mouse_out_del(self, func): 1302 def on_mouse_out_del(self, func):
1302 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_OUT, ...)""" 1303 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_OUT, ...)"""
1303 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_OUT, func) 1304 self.event_callback_del(EVAS_CALLBACK_MOUSE_OUT, func)
1304 1305
1305 def on_mouse_down_add(self, func, *a, **k): 1306 def on_mouse_down_add(self, func, *a, **k):
1306 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_DOWN, ...) 1307 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_DOWN, ...)
@@ -1309,11 +1310,11 @@ cdef class Object(Eo):
1309 1310
1310 function(object, event_info, *args, **kargs) 1311 function(object, event_info, *args, **kargs)
1311 """ 1312 """
1312 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_DOWN, func, *a, **k) 1313 self.event_callback_add(EVAS_CALLBACK_MOUSE_DOWN, func, *a, **k)
1313 1314
1314 def on_mouse_down_del(self, func): 1315 def on_mouse_down_del(self, func):
1315 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_DOWN, ...)""" 1316 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_DOWN, ...)"""
1316 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_DOWN, func) 1317 self.event_callback_del(EVAS_CALLBACK_MOUSE_DOWN, func)
1317 1318
1318 def on_mouse_up_add(self, func, *a, **k): 1319 def on_mouse_up_add(self, func, *a, **k):
1319 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_UP, ...) 1320 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_UP, ...)
@@ -1322,11 +1323,11 @@ cdef class Object(Eo):
1322 1323
1323 function(object, event_info, *args, **kargs) 1324 function(object, event_info, *args, **kargs)
1324 """ 1325 """
1325 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_UP, func, *a, **k) 1326 self.event_callback_add(EVAS_CALLBACK_MOUSE_UP, func, *a, **k)
1326 1327
1327 def on_mouse_up_del(self, func): 1328 def on_mouse_up_del(self, func):
1328 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_UP, ...)""" 1329 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_UP, ...)"""
1329 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_UP, func) 1330 self.event_callback_del(EVAS_CALLBACK_MOUSE_UP, func)
1330 1331
1331 def on_mouse_move_add(self, func, *a, **k): 1332 def on_mouse_move_add(self, func, *a, **k):
1332 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_MOVE, ...) 1333 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_MOVE, ...)
@@ -1335,11 +1336,11 @@ cdef class Object(Eo):
1335 1336
1336 function(object, event_info, *args, **kargs) 1337 function(object, event_info, *args, **kargs)
1337 """ 1338 """
1338 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_MOVE, func, *a, **k) 1339 self.event_callback_add(EVAS_CALLBACK_MOUSE_MOVE, func, *a, **k)
1339 1340
1340 def on_mouse_move_del(self, func): 1341 def on_mouse_move_del(self, func):
1341 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_MOVE, ...)""" 1342 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_MOVE, ...)"""
1342 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_MOVE, func) 1343 self.event_callback_del(EVAS_CALLBACK_MOUSE_MOVE, func)
1343 1344
1344 def on_mouse_wheel_add(self, func, *a, **k): 1345 def on_mouse_wheel_add(self, func, *a, **k):
1345 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_WHEEL, ...) 1346 """Same as event_callback_add(EVAS_CALLBACK_MOUSE_WHEEL, ...)
@@ -1348,11 +1349,11 @@ cdef class Object(Eo):
1348 1349
1349 function(object, event_info, *args, **kargs) 1350 function(object, event_info, *args, **kargs)
1350 """ 1351 """
1351 self.event_callback_add(enums.EVAS_CALLBACK_MOUSE_WHEEL, func, *a, **k) 1352 self.event_callback_add(EVAS_CALLBACK_MOUSE_WHEEL, func, *a, **k)
1352 1353
1353 def on_mouse_wheel_del(self, func): 1354 def on_mouse_wheel_del(self, func):
1354 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_WHEEL, ...)""" 1355 """Same as event_callback_del(EVAS_CALLBACK_MOUSE_WHEEL, ...)"""
1355 self.event_callback_del(enums.EVAS_CALLBACK_MOUSE_WHEEL, func) 1356 self.event_callback_del(EVAS_CALLBACK_MOUSE_WHEEL, func)
1356 1357
1357 def on_free_add(self, func, *a, **k): 1358 def on_free_add(self, func, *a, **k):
1358 """Same as event_callback_add(EVAS_CALLBACK_FREE, ...) 1359 """Same as event_callback_add(EVAS_CALLBACK_FREE, ...)
@@ -1364,11 +1365,11 @@ cdef class Object(Eo):
1364 1365
1365 function(object, *args, **kargs) 1366 function(object, *args, **kargs)
1366 """ 1367 """
1367 self.event_callback_add(enums.EVAS_CALLBACK_FREE, func, *a, **k) 1368 self.event_callback_add(EVAS_CALLBACK_FREE, func, *a, **k)
1368 1369
1369 def on_free_del(self, func): 1370 def on_free_del(self, func):
1370 """Same as event_callback_del(EVAS_CALLBACK_FREE, ...)""" 1371 """Same as event_callback_del(EVAS_CALLBACK_FREE, ...)"""
1371 self.event_callback_del(enums.EVAS_CALLBACK_FREE, func) 1372 self.event_callback_del(EVAS_CALLBACK_FREE, func)
1372 1373
1373 def on_key_down_add(self, func, *a, **k): 1374 def on_key_down_add(self, func, *a, **k):
1374 """Same as event_callback_add(EVAS_CALLBACK_KEY_DOWN, ...) 1375 """Same as event_callback_add(EVAS_CALLBACK_KEY_DOWN, ...)
@@ -1377,11 +1378,11 @@ cdef class Object(Eo):
1377 1378
1378 function(object, event_info, *args, **kargs) 1379 function(object, event_info, *args, **kargs)
1379 """ 1380 """
1380 self.event_callback_add(enums.EVAS_CALLBACK_KEY_DOWN, func, *a, **k) 1381 self.event_callback_add(EVAS_CALLBACK_KEY_DOWN, func, *a, **k)
1381 1382
1382 def on_key_down_del(self, func): 1383 def on_key_down_del(self, func):
1383 """Same as event_callback_del(EVAS_CALLBACK_KEY_DOWN, ...)""" 1384 """Same as event_callback_del(EVAS_CALLBACK_KEY_DOWN, ...)"""
1384 self.event_callback_del(enums.EVAS_CALLBACK_KEY_DOWN, func) 1385 self.event_callback_del(EVAS_CALLBACK_KEY_DOWN, func)
1385 1386
1386 def on_key_up_add(self, func, *a, **k): 1387 def on_key_up_add(self, func, *a, **k):
1387 """Same as event_callback_add(EVAS_CALLBACK_KEY_UP, ...) 1388 """Same as event_callback_add(EVAS_CALLBACK_KEY_UP, ...)
@@ -1390,11 +1391,11 @@ cdef class Object(Eo):
1390 1391
1391 function(object, event_info, *args, **kargs) 1392 function(object, event_info, *args, **kargs)
1392 """ 1393 """
1393 self.event_callback_add(enums.EVAS_CALLBACK_KEY_UP, func, *a, **k) 1394 self.event_callback_add(EVAS_CALLBACK_KEY_UP, func, *a, **k)
1394 1395
1395 def on_key_up_del(self, func): 1396 def on_key_up_del(self, func):
1396 """Same as event_callback_del(EVAS_CALLBACK_KEY_UP, ...)""" 1397 """Same as event_callback_del(EVAS_CALLBACK_KEY_UP, ...)"""
1397 self.event_callback_del(enums.EVAS_CALLBACK_KEY_UP, func) 1398 self.event_callback_del(EVAS_CALLBACK_KEY_UP, func)
1398 1399
1399 def on_focus_in_add(self, func, *a, **k): 1400 def on_focus_in_add(self, func, *a, **k):
1400 """Same as event_callback_add(EVAS_CALLBACK_FOCUS_IN, ...) 1401 """Same as event_callback_add(EVAS_CALLBACK_FOCUS_IN, ...)
@@ -1403,11 +1404,11 @@ cdef class Object(Eo):
1403 1404
1404 function(object, *args, **kargs) 1405 function(object, *args, **kargs)
1405 """ 1406 """
1406 self.event_callback_add(enums.EVAS_CALLBACK_FOCUS_IN, func, *a, **k) 1407 self.event_callback_add(EVAS_CALLBACK_FOCUS_IN, func, *a, **k)
1407 1408
1408 def on_focus_in_del(self, func): 1409 def on_focus_in_del(self, func):
1409 """Same as event_callback_del(EVAS_CALLBACK_FOCUS_IN, ...)""" 1410 """Same as event_callback_del(EVAS_CALLBACK_FOCUS_IN, ...)"""
1410 self.event_callback_del(enums.EVAS_CALLBACK_FOCUS_IN, func) 1411 self.event_callback_del(EVAS_CALLBACK_FOCUS_IN, func)
1411 1412
1412 def on_focus_out_add(self, func, *a, **k): 1413 def on_focus_out_add(self, func, *a, **k):
1413 """Same as event_callback_add(EVAS_CALLBACK_FOCUS_OUT, ...) 1414 """Same as event_callback_add(EVAS_CALLBACK_FOCUS_OUT, ...)
@@ -1416,11 +1417,11 @@ cdef class Object(Eo):
1416 1417
1417 function(object, *args, **kargs) 1418 function(object, *args, **kargs)
1418 """ 1419 """
1419 self.event_callback_add(enums.EVAS_CALLBACK_FOCUS_OUT, func, *a, **k) 1420 self.event_callback_add(EVAS_CALLBACK_FOCUS_OUT, func, *a, **k)
1420 1421
1421 def on_focus_out_del(self, func): 1422 def on_focus_out_del(self, func):
1422 """Same as event_callback_del(EVAS_CALLBACK_FOCUS_OUT, ...)""" 1423 """Same as event_callback_del(EVAS_CALLBACK_FOCUS_OUT, ...)"""
1423 self.event_callback_del(enums.EVAS_CALLBACK_FOCUS_OUT, func) 1424 self.event_callback_del(EVAS_CALLBACK_FOCUS_OUT, func)
1424 1425
1425 def on_show_add(self, func, *a, **k): 1426 def on_show_add(self, func, *a, **k):
1426 """Same as event_callback_add(EVAS_CALLBACK_SHOW, ...) 1427 """Same as event_callback_add(EVAS_CALLBACK_SHOW, ...)
@@ -1429,11 +1430,11 @@ cdef class Object(Eo):
1429 1430
1430 function(object, *args, **kargs) 1431 function(object, *args, **kargs)
1431 """ 1432 """
1432 self.event_callback_add(enums.EVAS_CALLBACK_SHOW, func, *a, **k) 1433 self.event_callback_add(EVAS_CALLBACK_SHOW, func, *a, **k)
1433 1434
1434 def on_show_del(self, func): 1435 def on_show_del(self, func):
1435 """Same as event_callback_del(EVAS_CALLBACK_SHOW, ...)""" 1436 """Same as event_callback_del(EVAS_CALLBACK_SHOW, ...)"""
1436 self.event_callback_del(enums.EVAS_CALLBACK_SHOW, func) 1437 self.event_callback_del(EVAS_CALLBACK_SHOW, func)
1437 1438
1438 def on_hide_add(self, func, *a, **k): 1439 def on_hide_add(self, func, *a, **k):
1439 """Same as event_callback_add(EVAS_CALLBACK_HIDE, ...) 1440 """Same as event_callback_add(EVAS_CALLBACK_HIDE, ...)
@@ -1442,11 +1443,11 @@ cdef class Object(Eo):
1442 1443
1443 function(object, *args, **kargs) 1444 function(object, *args, **kargs)
1444 """ 1445 """
1445 self.event_callback_add(enums.EVAS_CALLBACK_HIDE, func, *a, **k) 1446 self.event_callback_add(EVAS_CALLBACK_HIDE, func, *a, **k)
1446 1447
1447 def on_hide_del(self, func): 1448 def on_hide_del(self, func):
1448 """Same as event_callback_del(EVAS_CALLBACK_HIDE, ...)""" 1449 """Same as event_callback_del(EVAS_CALLBACK_HIDE, ...)"""
1449 self.event_callback_del(enums.EVAS_CALLBACK_HIDE, func) 1450 self.event_callback_del(EVAS_CALLBACK_HIDE, func)
1450 1451
1451 def on_move_add(self, func, *a, **k): 1452 def on_move_add(self, func, *a, **k):
1452 """Same as event_callback_add(EVAS_CALLBACK_MOVE, ...) 1453 """Same as event_callback_add(EVAS_CALLBACK_MOVE, ...)
@@ -1455,11 +1456,11 @@ cdef class Object(Eo):
1455 1456
1456 function(object, *args, **kargs) 1457 function(object, *args, **kargs)
1457 """ 1458 """
1458 self.event_callback_add(enums.EVAS_CALLBACK_MOVE, func, *a, **k) 1459 self.event_callback_add(EVAS_CALLBACK_MOVE, func, *a, **k)
1459 1460
1460 def on_move_del(self, func): 1461 def on_move_del(self, func):
1461 """Same as event_callback_del(EVAS_CALLBACK_MOVE, ...)""" 1462 """Same as event_callback_del(EVAS_CALLBACK_MOVE, ...)"""
1462 self.event_callback_del(enums.EVAS_CALLBACK_MOVE, func) 1463 self.event_callback_del(EVAS_CALLBACK_MOVE, func)
1463 1464
1464 def on_resize_add(self, func, *a, **k): 1465 def on_resize_add(self, func, *a, **k):
1465 """Same as event_callback_add(EVAS_CALLBACK_RESIZE, ...) 1466 """Same as event_callback_add(EVAS_CALLBACK_RESIZE, ...)
@@ -1468,11 +1469,11 @@ cdef class Object(Eo):
1468 1469
1469 function(object, *args, **kargs) 1470 function(object, *args, **kargs)
1470 """ 1471 """
1471 self.event_callback_add(enums.EVAS_CALLBACK_RESIZE, func, *a, **k) 1472 self.event_callback_add(EVAS_CALLBACK_RESIZE, func, *a, **k)
1472 1473
1473 def on_resize_del(self, func): 1474 def on_resize_del(self, func):
1474 """Same as event_callback_del(EVAS_CALLBACK_RESIZE, ...)""" 1475 """Same as event_callback_del(EVAS_CALLBACK_RESIZE, ...)"""
1475 self.event_callback_del(enums.EVAS_CALLBACK_RESIZE, func) 1476 self.event_callback_del(EVAS_CALLBACK_RESIZE, func)
1476 1477
1477 def on_restack_add(self, func, *a, **k): 1478 def on_restack_add(self, func, *a, **k):
1478 """Same as event_callback_add(EVAS_CALLBACK_RESTACK, ...) 1479 """Same as event_callback_add(EVAS_CALLBACK_RESTACK, ...)
@@ -1481,11 +1482,11 @@ cdef class Object(Eo):
1481 1482
1482 function(object, *args, **kargs) 1483 function(object, *args, **kargs)
1483 """ 1484 """
1484 self.event_callback_add(enums.EVAS_CALLBACK_RESTACK, func, *a, **k) 1485 self.event_callback_add(EVAS_CALLBACK_RESTACK, func, *a, **k)
1485 1486
1486 def on_restack_del(self, func): 1487 def on_restack_del(self, func):
1487 """Same as event_callback_del(EVAS_CALLBACK_RESTACK, ...)""" 1488 """Same as event_callback_del(EVAS_CALLBACK_RESTACK, ...)"""
1488 self.event_callback_del(enums.EVAS_CALLBACK_RESTACK, func) 1489 self.event_callback_del(EVAS_CALLBACK_RESTACK, func)
1489 1490
1490 def on_del_add(self, func, *a, **k): 1491 def on_del_add(self, func, *a, **k):
1491 """Same as event_callback_add(EVAS_CALLBACK_DEL, ...) 1492 """Same as event_callback_add(EVAS_CALLBACK_DEL, ...)
@@ -1497,27 +1498,27 @@ cdef class Object(Eo):
1497 1498
1498 function(object, *args, **kargs) 1499 function(object, *args, **kargs)
1499 """ 1500 """
1500 self.event_callback_add(enums.EVAS_CALLBACK_DEL, func, *a, **k) 1501 self.event_callback_add(EVAS_CALLBACK_DEL, func, *a, **k)
1501 1502
1502 def on_del_del(self, func): 1503 def on_del_del(self, func):
1503 """Same as event_callback_del(EVAS_CALLBACK_DEL, ...)""" 1504 """Same as event_callback_del(EVAS_CALLBACK_DEL, ...)"""
1504 self.event_callback_del(enums.EVAS_CALLBACK_DEL, func) 1505 self.event_callback_del(EVAS_CALLBACK_DEL, func)
1505 1506
1506 def on_hold_add(self, func, *a, **k): 1507 def on_hold_add(self, func, *a, **k):
1507 """Same as event_callback_add(EVAS_CALLBACK_HOLD, ...)""" 1508 """Same as event_callback_add(EVAS_CALLBACK_HOLD, ...)"""
1508 self.event_callback_add(enums.EVAS_CALLBACK_HOLD, func, *a, **k) 1509 self.event_callback_add(EVAS_CALLBACK_HOLD, func, *a, **k)
1509 1510
1510 def on_hold_del(self, func): 1511 def on_hold_del(self, func):
1511 """Same as event_callback_del(EVAS_CALLBACK_HOLD, ...)""" 1512 """Same as event_callback_del(EVAS_CALLBACK_HOLD, ...)"""
1512 self.event_callback_del(enums.EVAS_CALLBACK_HOLD, func) 1513 self.event_callback_del(EVAS_CALLBACK_HOLD, func)
1513 1514
1514 def on_changed_size_hints_add(self, func, *a, **k): 1515 def on_changed_size_hints_add(self, func, *a, **k):
1515 """Same as event_callback_add(EVAS_CALLBACK_CHANGED_SIZE_HINTS, ...)""" 1516 """Same as event_callback_add(EVAS_CALLBACK_CHANGED_SIZE_HINTS, ...)"""
1516 self.event_callback_add(enums.EVAS_CALLBACK_CHANGED_SIZE_HINTS, func, *a, **k) 1517 self.event_callback_add(EVAS_CALLBACK_CHANGED_SIZE_HINTS, func, *a, **k)
1517 1518
1518 def on_changed_size_hints_del(self, func): 1519 def on_changed_size_hints_del(self, func):
1519 """Same as event_callback_del(EVAS_CALLBACK_CHANGED_SIZE_HINTS, ...)""" 1520 """Same as event_callback_del(EVAS_CALLBACK_CHANGED_SIZE_HINTS, ...)"""
1520 self.event_callback_del(enums.EVAS_CALLBACK_CHANGED_SIZE_HINTS, func) 1521 self.event_callback_del(EVAS_CALLBACK_CHANGED_SIZE_HINTS, func)
1521 1522
1522 property pass_events: 1523 property pass_events:
1523 """Whenever object should ignore and pass events. 1524 """Whenever object should ignore and pass events.
diff --git a/efl/evas/efl.evas_object_callbacks.pxi b/efl/evas/efl.evas_object_callbacks.pxi
index 0de1b82..3dc7e7b 100644
--- a/efl/evas/efl.evas_object_callbacks.pxi
+++ b/efl/evas/efl.evas_object_callbacks.pxi
@@ -249,37 +249,37 @@ cdef void cb_object_canvas_render_post(void *data, Evas *e,
249cdef int evas_object_event_callbacks_len 249cdef int evas_object_event_callbacks_len
250cdef Evas_Object_Event_Cb evas_object_event_callbacks[34] 250cdef Evas_Object_Event_Cb evas_object_event_callbacks[34]
251evas_object_event_callbacks_len = 34 251evas_object_event_callbacks_len = 34
252evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in 252evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in
253evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out 253evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out
254evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down 254evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down
255evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_UP] = cb_object_mouse_up 255evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_UP] = cb_object_mouse_up
256evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_MOVE] = cb_object_mouse_move 256evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_MOVE] = cb_object_mouse_move
257evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_WHEEL] = cb_object_mouse_wheel 257evas_object_event_callbacks[<int>EVAS_CALLBACK_MOUSE_WHEEL] = cb_object_mouse_wheel
258evas_object_event_callbacks[EVAS_CALLBACK_MULTI_DOWN] = cb_object_multi_down 258evas_object_event_callbacks[<int>EVAS_CALLBACK_MULTI_DOWN] = cb_object_multi_down
259evas_object_event_callbacks[EVAS_CALLBACK_MULTI_UP] = cb_object_multi_up 259evas_object_event_callbacks[<int>EVAS_CALLBACK_MULTI_UP] = cb_object_multi_up
260evas_object_event_callbacks[EVAS_CALLBACK_MULTI_MOVE] = cb_object_multi_move 260evas_object_event_callbacks[<int>EVAS_CALLBACK_MULTI_MOVE] = cb_object_multi_move
261evas_object_event_callbacks[EVAS_CALLBACK_FREE] = cb_object_free 261evas_object_event_callbacks[<int>EVAS_CALLBACK_FREE] = cb_object_free
262evas_object_event_callbacks[EVAS_CALLBACK_KEY_DOWN] = cb_object_key_down 262evas_object_event_callbacks[<int>EVAS_CALLBACK_KEY_DOWN] = cb_object_key_down
263evas_object_event_callbacks[EVAS_CALLBACK_KEY_UP] = cb_object_key_up 263evas_object_event_callbacks[<int>EVAS_CALLBACK_KEY_UP] = cb_object_key_up
264evas_object_event_callbacks[EVAS_CALLBACK_FOCUS_IN] = cb_object_focus_in 264evas_object_event_callbacks[<int>EVAS_CALLBACK_FOCUS_IN] = cb_object_focus_in
265evas_object_event_callbacks[EVAS_CALLBACK_FOCUS_OUT] = cb_object_focus_out 265evas_object_event_callbacks[<int>EVAS_CALLBACK_FOCUS_OUT] = cb_object_focus_out
266evas_object_event_callbacks[EVAS_CALLBACK_SHOW] = cb_object_show 266evas_object_event_callbacks[<int>EVAS_CALLBACK_SHOW] = cb_object_show
267evas_object_event_callbacks[EVAS_CALLBACK_HIDE] = cb_object_hide 267evas_object_event_callbacks[<int>EVAS_CALLBACK_HIDE] = cb_object_hide
268evas_object_event_callbacks[EVAS_CALLBACK_MOVE] = cb_object_move 268evas_object_event_callbacks[<int>EVAS_CALLBACK_MOVE] = cb_object_move
269evas_object_event_callbacks[EVAS_CALLBACK_RESIZE] = cb_object_resize 269evas_object_event_callbacks[<int>EVAS_CALLBACK_RESIZE] = cb_object_resize
270evas_object_event_callbacks[EVAS_CALLBACK_RESTACK] = cb_object_restack 270evas_object_event_callbacks[<int>EVAS_CALLBACK_RESTACK] = cb_object_restack
271evas_object_event_callbacks[EVAS_CALLBACK_DEL] = cb_object_del 271evas_object_event_callbacks[<int>EVAS_CALLBACK_DEL] = cb_object_del
272evas_object_event_callbacks[EVAS_CALLBACK_HOLD] = cb_object_hold 272evas_object_event_callbacks[<int>EVAS_CALLBACK_HOLD] = cb_object_hold
273evas_object_event_callbacks[EVAS_CALLBACK_CHANGED_SIZE_HINTS] = cb_object_changed_size_hints 273evas_object_event_callbacks[<int>EVAS_CALLBACK_CHANGED_SIZE_HINTS] = cb_object_changed_size_hints
274evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_PRELOADED] = cb_object_image_preloaded 274evas_object_event_callbacks[<int>EVAS_CALLBACK_IMAGE_PRELOADED] = cb_object_image_preloaded
275evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_FOCUS_IN] = cb_object_canvas_focus_in 275evas_object_event_callbacks[<int>EVAS_CALLBACK_CANVAS_FOCUS_IN] = cb_object_canvas_focus_in
276evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_FOCUS_OUT] = cb_object_canvas_focus_out 276evas_object_event_callbacks[<int>EVAS_CALLBACK_CANVAS_FOCUS_OUT] = cb_object_canvas_focus_out
277evas_object_event_callbacks[EVAS_CALLBACK_RENDER_FLUSH_PRE] = cb_object_render_flush_pre 277evas_object_event_callbacks[<int>EVAS_CALLBACK_RENDER_FLUSH_PRE] = cb_object_render_flush_pre
278evas_object_event_callbacks[EVAS_CALLBACK_RENDER_FLUSH_POST] = cb_object_render_flush_post 278evas_object_event_callbacks[<int>EVAS_CALLBACK_RENDER_FLUSH_POST] = cb_object_render_flush_post
279evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN] = cb_object_canvas_object_focus_in 279evas_object_event_callbacks[<int>EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN] = cb_object_canvas_object_focus_in
280evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_object_canvas_object_focus_out 280evas_object_event_callbacks[<int>EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_object_canvas_object_focus_out
281evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded 281evas_object_event_callbacks[<int>EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded
282evas_object_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre 282evas_object_event_callbacks[<int>EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre
283evas_object_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post 283evas_object_event_callbacks[<int>EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post
284evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_object_image_resize 284evas_object_event_callbacks[<int>EVAS_CALLBACK_IMAGE_RESIZE] = cb_object_image_resize
285evas_object_event_callbacks[EVAS_CALLBACK_DEVICE_CHANGED] = cb_object_device_changed 285evas_object_event_callbacks[<int>EVAS_CALLBACK_DEVICE_CHANGED] = cb_object_device_changed
diff --git a/efl/evas/efl.evas_object_textgrid.pxi b/efl/evas/efl.evas_object_textgrid.pxi
index ed34ebb..c21c0c0 100644
--- a/efl/evas/efl.evas_object_textgrid.pxi
+++ b/efl/evas/efl.evas_object_textgrid.pxi
@@ -58,15 +58,6 @@
58 58
59from libc.stdlib cimport malloc 59from libc.stdlib cimport malloc
60 60
61EVAS_TEXTGRID_PALETTE_NONE = enums.EVAS_TEXTGRID_PALETTE_NONE
62EVAS_TEXTGRID_PALETTE_STANDARD = enums.EVAS_TEXTGRID_PALETTE_STANDARD
63EVAS_TEXTGRID_PALETTE_EXTENDED = enums.EVAS_TEXTGRID_PALETTE_EXTENDED
64EVAS_TEXTGRID_PALETTE_LAST = enums.EVAS_TEXTGRID_PALETTE_LAST
65
66EVAS_TEXTGRID_FONT_STYLE_NORMAL = enums.EVAS_TEXTGRID_FONT_STYLE_NORMAL
67EVAS_TEXTGRID_FONT_STYLE_BOLD = enums.EVAS_TEXTGRID_FONT_STYLE_BOLD
68EVAS_TEXTGRID_FONT_STYLE_ITALIC = enums.EVAS_TEXTGRID_FONT_STYLE_ITALIC
69
70 61
71cdef class TextgridCell(object): 62cdef class TextgridCell(object):
72 """ 63 """