summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2013-02-19 20:20:10 +0000
committerKai Huuhko <kai.huuhko@gmail.com>2013-02-19 20:20:10 +0000
commitb6d559c63726052ec78d92fb9989c16c4a2e303a (patch)
treec4f36cb781e5449bbc562a2619f1461468126568
parentd6eb94b6a926e86d027943e6798691a97d7f1b05 (diff)
python-evas: Reverting commits 76211, 76878 and 76880 to have 1.7 API in the separate dirs with trunk development in python-efl.HEADmaster
SVN revision: 84243
-rw-r--r--evas/__init__.py2
-rw-r--r--evas/evas.c_evas_canvas_callbacks.pxi11
-rw-r--r--evas/evas.c_evas_object_callbacks.pxi13
-rw-r--r--include/evas/c_evas.pxd2
4 files changed, 4 insertions, 24 deletions
diff --git a/evas/__init__.py b/evas/__init__.py
index e9c9bad..c40f036 100644
--- a/evas/__init__.py
+++ b/evas/__init__.py
@@ -62,8 +62,6 @@ 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
66EVAS_CALLBACK_DEVICE_CHANGED = 33
67 65
68EVAS_BUTTON_NONE = 0 66EVAS_BUTTON_NONE = 0
69EVAS_BUTTON_DOUBLE_CLICK = 1 67EVAS_BUTTON_DOUBLE_CLICK = 1
diff --git a/evas/evas.c_evas_canvas_callbacks.pxi b/evas/evas.c_evas_canvas_callbacks.pxi
index 8d5fb2d..6d0c37a 100644
--- a/evas/evas.c_evas_canvas_callbacks.pxi
+++ b/evas/evas.c_evas_canvas_callbacks.pxi
@@ -132,11 +132,6 @@ 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."
137
138cdef void cb_canvas_device_changed(void *data, Evas *e, void *e_inf) with gil:
139 print "EVAS_CALLBACK_DEVICE_CHANGED is not supported by canvas."
140 135
141cdef void cb_canvas_canvas_focus_in(void *data, Evas *e, void *e_inf) with gil: 136cdef void cb_canvas_canvas_focus_in(void *data, Evas *e, void *e_inf) with gil:
142 cb_canvas_dispatcher2(<Canvas>data, EVAS_CALLBACK_CANVAS_FOCUS_IN) 137 cb_canvas_dispatcher2(<Canvas>data, EVAS_CALLBACK_CANVAS_FOCUS_IN)
@@ -183,8 +178,8 @@ cdef void cb_canvas_render_post(void *data, Evas *e, void *e_inf) with gil:
183 178
184 179
185cdef int evas_canvas_event_callbacks_len 180cdef int evas_canvas_event_callbacks_len
186cdef Evas_Event_Cb evas_canvas_event_callbacks[34] 181cdef Evas_Event_Cb evas_canvas_event_callbacks[32]
187evas_canvas_event_callbacks_len = 34 182evas_canvas_event_callbacks_len = 32
188evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in 183evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_canvas_mouse_in
189evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out 184evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_canvas_mouse_out
190evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down 185evas_canvas_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_canvas_mouse_down
@@ -217,5 +212,3 @@ evas_canvas_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_canvas_c
217evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded 212evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_canvas_image_unloaded
218evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre 213evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_canvas_render_pre
219evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post 214evas_canvas_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_canvas_render_post
220evas_canvas_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_canvas_image_resize
221evas_canvas_event_callbacks[EVAS_CALLBACK_DEVICE_CHANGED] = cb_canvas_device_changed
diff --git a/evas/evas.c_evas_object_callbacks.pxi b/evas/evas.c_evas_object_callbacks.pxi
index fe98d23..f2b39ef 100644
--- a/evas/evas.c_evas_object_callbacks.pxi
+++ b/evas/evas.c_evas_object_callbacks.pxi
@@ -202,13 +202,6 @@ 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)
208
209cdef void cb_object_device_changed(void *data, Evas *e,
210 Evas_Object *obj, void *e_inf) with gil:
211 cb_object_dispatcher2(<Object>data, EVAS_CALLBACK_DEVICE_CHANGED)
212 205
213cdef void cb_object_canvas_focus_in(void *data, Evas *e, 206cdef void cb_object_canvas_focus_in(void *data, Evas *e,
214 Evas_Object *obj, void *e_inf) with gil: 207 Evas_Object *obj, void *e_inf) with gil:
@@ -251,8 +244,8 @@ cdef void cb_object_canvas_render_post(void *data, Evas *e,
251 244
252 245
253cdef int evas_object_event_callbacks_len 246cdef int evas_object_event_callbacks_len
254cdef Evas_Object_Event_Cb evas_object_event_callbacks[34] 247cdef Evas_Object_Event_Cb evas_object_event_callbacks[32]
255evas_object_event_callbacks_len = 34 248evas_object_event_callbacks_len = 32
256evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in 249evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_IN] = cb_object_mouse_in
257evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out 250evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_OUT] = cb_object_mouse_out
258evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down 251evas_object_event_callbacks[EVAS_CALLBACK_MOUSE_DOWN] = cb_object_mouse_down
@@ -285,5 +278,3 @@ evas_object_event_callbacks[EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT] = cb_object_c
285evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded 278evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_UNLOADED] = cb_object_image_unloaded
286evas_object_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre 279evas_object_event_callbacks[EVAS_CALLBACK_RENDER_PRE] = cb_object_canvas_render_pre
287evas_object_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post 280evas_object_event_callbacks[EVAS_CALLBACK_RENDER_POST] = cb_object_canvas_render_post
288evas_object_event_callbacks[EVAS_CALLBACK_IMAGE_RESIZE] = cb_object_image_resize
289evas_object_event_callbacks[EVAS_CALLBACK_DEVICE_CHANGED] = cb_object_device_changed
diff --git a/include/evas/c_evas.pxd b/include/evas/c_evas.pxd
index fe3343c..94c5983 100644
--- a/include/evas/c_evas.pxd
+++ b/include/evas/c_evas.pxd
@@ -76,8 +76,6 @@ 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
80 cdef int EVAS_CALLBACK_DEVICE_CHANGED
81 cdef int EVAS_CALLBACK_LAST 79 cdef int EVAS_CALLBACK_LAST
82 80
83 81