summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-09-06 02:11:21 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-09-06 02:11:21 +0000
commitfa314c3be6eb7d7a09a50c9ace5b4e4c36d71ca3 (patch)
tree8a62fd68f65e33d170919c59832c2d4764d2255f
parentf967832ffbb9eea12574b5ddee9bd3d04be45b7e (diff)
update evas to support new Evas API.
SVN revision: 76211
-rw-r--r--evas/__init__.py1
-rw-r--r--evas/evas.c_evas_canvas_callbacks.pxi7
-rw-r--r--evas/evas.c_evas_object_callbacks.pxi8
-rw-r--r--include/evas/c_evas.pxd1
4 files changed, 13 insertions, 4 deletions
diff --git a/evas/__init__.py b/evas/__init__.py
index c40f036..7bb441b 100644
--- a/evas/__init__.py
+++ b/evas/__init__.py
@@ -62,6 +62,7 @@ EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT = 28
62EVAS_CALLBACK_IMAGE_UNLOADED = 29 62EVAS_CALLBACK_IMAGE_UNLOADED = 29
63EVAS_CALLBACK_RENDER_PRE = 30 63EVAS_CALLBACK_RENDER_PRE = 30
64EVAS_CALLBACK_RENDER_POST = 31 64EVAS_CALLBACK_RENDER_POST = 31
65EVAS_CALLBACK_IMAGE_RESIZE = 32
65 66
66EVAS_BUTTON_NONE = 0 67EVAS_BUTTON_NONE = 0
67EVAS_BUTTON_DOUBLE_CLICK = 1 68EVAS_BUTTON_DOUBLE_CLICK = 1
diff --git a/evas/evas.c_evas_canvas_callbacks.pxi b/evas/evas.c_evas_canvas_callbacks.pxi
index 6d0c37a..c45c5bb 100644
--- a/evas/evas.c_evas_canvas_callbacks.pxi
+++ b/evas/evas.c_evas_canvas_callbacks.pxi
@@ -132,6 +132,8 @@ cdef void cb_canvas_changed_size_hints(void *data, Evas *e, void *e_inf) with gi
132cdef void cb_canvas_image_preloaded(void *data, Evas *e, void *e_inf) with gil: 132cdef void cb_canvas_image_preloaded(void *data, Evas *e, void *e_inf) with gil:
133 print "EVAS_CALLBACK_IMAGE_PRELOADED is not supported by canvas." 133 print "EVAS_CALLBACK_IMAGE_PRELOADED is not supported by canvas."
134 134
135cdef void cb_canvas_image_resize(void *data, Evas *e, void *e_inf) with gil:
136 print "EVAS_CALLBACK_IMAGE_RESIZE is not supported by canvas."
135 137
136cdef void cb_canvas_canvas_focus_in(void *data, Evas *e, void *e_inf) with gil: 138cdef void cb_canvas_canvas_focus_in(void *data, Evas *e, void *e_inf) with gil:
137 cb_canvas_dispatcher2(<Canvas>data, EVAS_CALLBACK_CANVAS_FOCUS_IN) 139 cb_canvas_dispatcher2(<Canvas>data, EVAS_CALLBACK_CANVAS_FOCUS_IN)
@@ -178,8 +180,8 @@ cdef void cb_canvas_render_post(void *data, Evas *e, void *e_inf) with gil:
178 180
179 181
180cdef int evas_canvas_event_callbacks_len 182cdef int evas_canvas_event_callbacks_len
181cdef Evas_Event_Cb evas_canvas_event_callbacks[32] 183cdef Evas_Event_Cb evas_canvas_event_callbacks[33]
182evas_canvas_event_callbacks_len = 32 184evas_canvas_event_callbacks_len = 33
183evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in 185evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in
184evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out 186evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out
185evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down 187evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down
@@ -212,3 +214,4 @@ evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_canvas_c
212evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded 214evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded
213evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre 215evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre
214evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post 216evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post
217evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_canvas_image_resize
diff --git a/evas/evas.c_evas_object_callbacks.pxi b/evas/evas.c_evas_object_callbacks.pxi
index f2b39ef..b599b04 100644
--- a/evas/evas.c_evas_object_callbacks.pxi
+++ b/evas/evas.c_evas_object_callbacks.pxi
@@ -202,6 +202,9 @@ cdef void cb_object_image_preloaded(void *data, Evas *e,
202 Evas_Object *obj, void *e_inf) with gil: 202 Evas_Object *obj, void *e_inf) with gil:
203 cb_object_dispatcher2(<Object>data, EVAS_CALLBACK_IMAGE_PRELOADED) 203 cb_object_dispatcher2(<Object>data, EVAS_CALLBACK_IMAGE_PRELOADED)
204 204
205cdef void cb_object_image_resize(void *data, Evas *e,
206 Evas_Object *obj, void *e_inf) with gil:
207 cb_object_dispatcher2(<Object>data, EVAS_CALLBACK_IMAGE_RESIZE)
205 208
206cdef void cb_object_canvas_focus_in(void *data, Evas *e, 209cdef void cb_object_canvas_focus_in(void *data, Evas *e,
207 Evas_Object *obj, void *e_inf) with gil: 210 Evas_Object *obj, void *e_inf) with gil:
@@ -244,8 +247,8 @@ cdef void cb_object_canvas_render_post(void *data, Evas *e,
244 247
245 248
246cdef int evas_object_event_callbacks_len 249cdef int evas_object_event_callbacks_len
247cdef Evas_Object_Event_Cb evas_object_event_callbacks[32] 250cdef Evas_Object_Event_Cb evas_object_event_callbacks[33]
248evas_object_event_callbacks_len = 32 251evas_object_event_callbacks_len = 33
249evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in 252evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in
250evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out 253evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out
251evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down 254evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down
@@ -278,3 +281,4 @@ evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_object_c
278evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded 281evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded
279evas_object_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre 282evas_object_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre
280evas_object_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post 283evas_object_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post
284evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_object_image_resize
diff --git a/include/evas/c_evas.pxd b/include/evas/c_evas.pxd
index 94c5983..6b3725d 100644
--- a/include/evas/c_evas.pxd
+++ b/include/evas/c_evas.pxd
@@ -76,6 +76,7 @@ cdef extern from "Evas.h":
76 cdef int EVAS_CALLBACK_IMAGE_UNLOADED 76 cdef int EVAS_CALLBACK_IMAGE_UNLOADED
77 cdef int EVAS_CALLBACK_RENDER_PRE 77 cdef int EVAS_CALLBACK_RENDER_PRE
78 cdef int EVAS_CALLBACK_RENDER_POST 78 cdef int EVAS_CALLBACK_RENDER_POST
79 cdef int EVAS_CALLBACK_IMAGE_RESIZE
79 cdef int EVAS_CALLBACK_LAST 80 cdef int EVAS_CALLBACK_LAST
80 81
81 82