summaryrefslogtreecommitdiff
path: root/efl
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2014-04-05 03:13:15 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2014-04-05 03:13:15 +0300
commitadf70fa26fcae845b0bc55c6eebcaeafadc4d1c7 (patch)
treec5bf8953e6b6081bb6542eb5372295875151df02 /efl
parent1149c6ed91a5dcb6e23998ba112d9e3d20a5ceb9 (diff)
Remove const hacks
They were a workaround for limitations in Cython <0.18
Diffstat (limited to 'efl')
-rw-r--r--efl/dbus_mainloop/dbus_mainloop.pxd3
-rw-r--r--efl/ecore/efl.ecore_exe.pxi8
-rw-r--r--efl/ecore/efl.ecore_file_download.pxi14
-rw-r--r--efl/ecore/efl.ecore_file_monitor.pxi6
-rw-r--r--efl/edje/efl.edje.pyx28
-rw-r--r--efl/edje/efl.edje_edit.pyx104
-rw-r--r--efl/edje/efl.edje_edit_group.pxi2
-rw-r--r--efl/edje/efl.edje_edit_part.pxi48
-rw-r--r--efl/edje/efl.edje_edit_part_state.pxi30
-rw-r--r--efl/edje/efl.edje_edit_program.pxi40
-rw-r--r--efl/edje/efl.edje_external.pxi26
-rw-r--r--efl/edje/efl.edje_object.pxi128
-rw-r--r--efl/elementary/access.pxd11
-rw-r--r--efl/elementary/access.pyx4
-rw-r--r--efl/elementary/actionslider.pyx3
-rw-r--r--efl/elementary/background.pxd5
-rw-r--r--efl/elementary/background.pyx16
-rw-r--r--efl/elementary/box.pxd2
-rw-r--r--efl/elementary/calendar_elm.pxd13
-rw-r--r--efl/elementary/calendar_elm.pyx4
-rw-r--r--efl/elementary/cnp_callbacks.pxi12
-rw-r--r--efl/elementary/colorselector.pxd15
-rw-r--r--efl/elementary/colorselector.pyx6
-rw-r--r--efl/elementary/configuration.pxd34
-rw-r--r--efl/elementary/configuration.pyx28
-rw-r--r--efl/elementary/ctxpopup.pxd7
-rw-r--r--efl/elementary/ctxpopup.pyx4
-rw-r--r--efl/elementary/datetime_elm.pxd5
-rw-r--r--efl/elementary/datetime_elm.pyx2
-rw-r--r--efl/elementary/dayselector.pxd15
-rw-r--r--efl/elementary/diskselector.pxd8
-rw-r--r--efl/elementary/diskselector.pyx4
-rw-r--r--efl/elementary/entry.pxd54
-rw-r--r--efl/elementary/entry.pyx48
-rw-r--r--efl/elementary/fileselector.pxd41
-rw-r--r--efl/elementary/fileselector.pyx16
-rw-r--r--efl/elementary/fileselector_button.pxd5
-rw-r--r--efl/elementary/fileselector_button.pyx8
-rw-r--r--efl/elementary/fileselector_entry.pxd5
-rw-r--r--efl/elementary/fileselector_entry.pyx12
-rw-r--r--efl/elementary/flipselector.pxd25
-rw-r--r--efl/elementary/flipselector.pyx8
-rw-r--r--efl/elementary/general.pxd35
-rw-r--r--efl/elementary/general.pyx10
-rw-r--r--efl/elementary/gengrid.pxd39
-rw-r--r--efl/elementary/gengrid.pyx8
-rw-r--r--efl/elementary/gengrid_item.pxi16
-rw-r--r--efl/elementary/genlist.pxd48
-rw-r--r--efl/elementary/genlist.pyx8
-rw-r--r--efl/elementary/genlist_item.pxi18
-rw-r--r--efl/elementary/gesture_layer.pxd26
-rw-r--r--efl/elementary/glview.pxd6
-rw-r--r--efl/elementary/hoversel.pxd7
-rw-r--r--efl/elementary/hoversel.pyx24
-rw-r--r--efl/elementary/icon.pxd9
-rw-r--r--efl/elementary/icon.pyx12
-rw-r--r--efl/elementary/image.pxd10
-rw-r--r--efl/elementary/image.pyx18
-rw-r--r--efl/elementary/index.pxd21
-rw-r--r--efl/elementary/index.pyx14
-rw-r--r--efl/elementary/label.pxd4
-rw-r--r--efl/elementary/layout.pxd1
-rw-r--r--efl/elementary/layout_class.pxd61
-rw-r--r--efl/elementary/layout_class.pyx84
-rw-r--r--efl/elementary/list.pxd17
-rw-r--r--efl/elementary/list.pyx18
-rw-r--r--efl/elementary/map.pxd45
-rw-r--r--efl/elementary/map.pyx10
-rw-r--r--efl/elementary/mapbuf.pxd10
-rw-r--r--efl/elementary/menu.pxd10
-rw-r--r--efl/elementary/menu.pyx12
-rw-r--r--efl/elementary/multibuttonentry.pxd37
-rw-r--r--efl/elementary/multibuttonentry.pyx18
-rw-r--r--efl/elementary/naviframe.pxd11
-rw-r--r--efl/elementary/naviframe.pyx16
-rw-r--r--efl/elementary/notify.pxd4
-rw-r--r--efl/elementary/object.pxd98
-rw-r--r--efl/elementary/object.pyx102
-rw-r--r--efl/elementary/object_item.pxd49
-rw-r--r--efl/elementary/object_item.pyx52
-rw-r--r--efl/elementary/photo.pxd5
-rw-r--r--efl/elementary/photo.pyx12
-rw-r--r--efl/elementary/photocam.pxd5
-rw-r--r--efl/elementary/photocam.pyx4
-rw-r--r--efl/elementary/plug.pxd3
-rw-r--r--efl/elementary/plug.pyx2
-rw-r--r--efl/elementary/popup.pxd3
-rw-r--r--efl/elementary/popup.pyx4
-rw-r--r--efl/elementary/progressbar.pxd11
-rw-r--r--efl/elementary/progressbar.pyx8
-rw-r--r--efl/elementary/scroller.pxd17
-rw-r--r--efl/elementary/scroller.pyx7
-rw-r--r--efl/elementary/segment_control.pxd7
-rw-r--r--efl/elementary/segment_control.pyx8
-rw-r--r--efl/elementary/slider.pxd29
-rw-r--r--efl/elementary/slider.pyx8
-rw-r--r--efl/elementary/slideshow.pxd20
-rw-r--r--efl/elementary/slideshow.pyx6
-rw-r--r--efl/elementary/spinner.pxd9
-rw-r--r--efl/elementary/spinner.pyx6
-rw-r--r--efl/elementary/store.pxd39
-rw-r--r--efl/elementary/store.pyx14
-rw-r--r--efl/elementary/table.pxd5
-rw-r--r--efl/elementary/theme.pxd15
-rw-r--r--efl/elementary/theme.pyx20
-rw-r--r--efl/elementary/thumb.pxd25
-rw-r--r--efl/elementary/thumb.pyx12
-rw-r--r--efl/elementary/toolbar.pxd27
-rw-r--r--efl/elementary/toolbar.pyx34
-rw-r--r--efl/elementary/transit.pxd9
-rw-r--r--efl/elementary/video.pxd5
-rw-r--r--efl/elementary/video.pyx4
-rw-r--r--efl/elementary/web.pxd27
-rw-r--r--efl/elementary/web.pyx4
-rw-r--r--efl/elementary/window.pxd57
-rw-r--r--efl/elementary/window.pyx28
-rw-r--r--efl/emotion/efl.emotion.pyx26
-rw-r--r--efl/eo/efl.eo.pyx22
-rw-r--r--efl/evas/efl.evas.pyx2
-rw-r--r--efl/evas/efl.evas_canvas.pxi12
-rw-r--r--efl/evas/efl.evas_object.pxi10
-rw-r--r--efl/evas/efl.evas_object_image.pxi22
-rw-r--r--efl/evas/efl.evas_object_text.pxi8
-rw-r--r--efl/evas/efl.evas_object_textblock.pxi8
-rw-r--r--efl/evas/efl.evas_object_textgrid.pxi6
-rw-r--r--efl/utils/conversions.pyx24
-rw-r--r--efl/utils/logger.pyx11
127 files changed, 1210 insertions, 1285 deletions
diff --git a/efl/dbus_mainloop/dbus_mainloop.pxd b/efl/dbus_mainloop/dbus_mainloop.pxd
index 3a363a5..78f73ce 100644
--- a/efl/dbus_mainloop/dbus_mainloop.pxd
+++ b/efl/dbus_mainloop/dbus_mainloop.pxd
@@ -1,5 +1,4 @@
1from cpython cimport PyObject 1from cpython cimport PyObject
2from libc.string cimport const_char
3 2
4cdef extern from "dbus/dbus.h": 3cdef extern from "dbus/dbus.h":
5 ctypedef int dbus_bool_t 4 ctypedef int dbus_bool_t
@@ -11,7 +10,7 @@ cdef extern from "dbus/dbus-python.h":
11 ctypedef dbus_bool_t (*_dbus_py_srv_setup_func)(DBusServer *, void *) 10 ctypedef dbus_bool_t (*_dbus_py_srv_setup_func)(DBusServer *, void *)
12 ctypedef void (*_dbus_py_free_func)(void *) 11 ctypedef void (*_dbus_py_free_func)(void *)
13 PyObject *DBusPyNativeMainLoop_New4(_dbus_py_conn_setup_func conn_func, _dbus_py_srv_setup_func srv_func, _dbus_py_free_func free_func, void *) 12 PyObject *DBusPyNativeMainLoop_New4(_dbus_py_conn_setup_func conn_func, _dbus_py_srv_setup_func srv_func, _dbus_py_free_func free_func, void *)
14 int import_dbus_bindings(const_char *this_module_name) 13 int import_dbus_bindings(const char *this_module_name)
15 14
16cdef extern from "Ecore.h": 15cdef extern from "Ecore.h":
17 int ecore_init() 16 int ecore_init()
diff --git a/efl/ecore/efl.ecore_exe.pxi b/efl/ecore/efl.ecore_exe.pxi
index 963a602..96bbea4 100644
--- a/efl/ecore/efl.ecore_exe.pxi
+++ b/efl/ecore/efl.ecore_exe.pxi
@@ -153,7 +153,7 @@ cdef object _ecore_exe_event_mapping
153_ecore_exe_event_mapping = {} 153_ecore_exe_event_mapping = {}
154 154
155 155
156cdef void _ecore_exe_pre_free_cb(void *data, const_Ecore_Exe *exe) with gil: 156cdef void _ecore_exe_pre_free_cb(void *data, const Ecore_Exe *exe) with gil:
157 cdef Exe obj 157 cdef Exe obj
158 try: 158 try:
159 if data == NULL: 159 if data == NULL:
@@ -411,7 +411,7 @@ cdef class Exe(object):
411 "given size (%d) is larger than buffer size (%d)." % 411 "given size (%d) is larger than buffer size (%d)." %
412 (size, buf_view.len)) 412 (size, buf_view.len))
413 413
414 ret = ecore_exe_send(self.exe, <const_void *>buf_view.buf, buf_view.len) 414 ret = ecore_exe_send(self.exe, <const void *>buf_view.buf, buf_view.len)
415 PyBuffer_Release(&buf_view) 415 PyBuffer_Release(&buf_view)
416 return ret 416 return ret
417 417
@@ -449,7 +449,7 @@ cdef class Exe(object):
449 :rtype: str or None 449 :rtype: str or None
450 450
451 """ 451 """
452 cdef const_char *cmd = ecore_exe_cmd_get(self.exe) 452 cdef const char *cmd = ecore_exe_cmd_get(self.exe)
453 if cmd != NULL: 453 if cmd != NULL:
454 return cmd 454 return cmd
455 return None 455 return None
@@ -500,7 +500,7 @@ cdef class Exe(object):
500 :rtype: str or None 500 :rtype: str or None
501 501
502 """ 502 """
503 cdef const_char *tag = ecore_exe_tag_get(self.exe) 503 cdef const char *tag = ecore_exe_tag_get(self.exe)
504 if tag != NULL: 504 if tag != NULL:
505 return tag 505 return tag
506 return None 506 return None
diff --git a/efl/ecore/efl.ecore_file_download.pxi b/efl/ecore/efl.ecore_file_download.pxi
index d883496..63592ea 100644
--- a/efl/ecore/efl.ecore_file_download.pxi
+++ b/efl/ecore/efl.ecore_file_download.pxi
@@ -17,14 +17,14 @@
17 17
18from cpython cimport PyUnicode_AsUTF8String 18from cpython cimport PyUnicode_AsUTF8String
19 19
20cdef void _completion_cb(void *data, const_char *file, int status) with gil: 20cdef void _completion_cb(void *data, const char *file, int status) with gil:
21 obj = <FileDownload>data 21 obj = <FileDownload>data
22 try: 22 try:
23 obj._exec_completion(file, status) 23 obj._exec_completion(file, status)
24 except Exception, e: 24 except Exception, e:
25 traceback.print_exc() 25 traceback.print_exc()
26 26
27cdef int _progress_cb(void *data, const_char *file, long int dltotal, 27cdef int _progress_cb(void *data, const char *file, long int dltotal,
28 long int dlnow, long int ultotal, long int ulnow) with gil: 28 long int dlnow, long int ultotal, long int ulnow) with gil:
29 obj = <FileDownload>data 29 obj = <FileDownload>data
30 try: 30 try:
@@ -92,8 +92,8 @@ cdef class FileDownload(object):
92 if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url) 92 if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url)
93 if isinstance(dst, unicode): dst = PyUnicode_AsUTF8String(dst) 93 if isinstance(dst, unicode): dst = PyUnicode_AsUTF8String(dst)
94 if not ecore_file_download( 94 if not ecore_file_download(
95 <const_char *>url if url is not None else NULL, 95 <const char *>url if url is not None else NULL,
96 <const_char *>dst if dst is not None else NULL, 96 <const char *>dst if dst is not None else NULL,
97 _completion_cb, _progress_cb, 97 _completion_cb, _progress_cb,
98 <void *>self, &job): 98 <void *>self, &job):
99 raise SystemError("could not download '%s' to %s" % (url, dst)) 99 raise SystemError("could not download '%s' to %s" % (url, dst))
@@ -122,11 +122,11 @@ cdef class FileDownload(object):
122 self.args = None 122 self.args = None
123 self.kargs = None 123 self.kargs = None
124 124
125 cdef object _exec_completion(self, const_char *file, int status): 125 cdef object _exec_completion(self, const char *file, int status):
126 if self.completion_cb: 126 if self.completion_cb:
127 self.completion_cb(_ctouni(file), status, *self.args, **self.kargs) 127 self.completion_cb(_ctouni(file), status, *self.args, **self.kargs)
128 128
129 cdef object _exec_progress(self, const_char *file, long int dltotal, 129 cdef object _exec_progress(self, const char *file, long int dltotal,
130 long int dlnow, long int ultotal, long int ulnow): 130 long int dlnow, long int ultotal, long int ulnow):
131 if self.progress_cb: 131 if self.progress_cb:
132 return self.progress_cb(_ctouni(file), dltotal, dlnow, ultotal, ulnow, 132 return self.progress_cb(_ctouni(file), dltotal, dlnow, ultotal, ulnow,
@@ -185,4 +185,4 @@ def file_download_protocol_available(protocol):
185 """ 185 """
186 if isinstance(protocol, unicode): protocol = PyUnicode_AsUTF8String(protocol) 186 if isinstance(protocol, unicode): protocol = PyUnicode_AsUTF8String(protocol)
187 return bool(ecore_file_download_protocol_available( 187 return bool(ecore_file_download_protocol_available(
188 <const_char *>protocol if protocol is not None else NULL)) 188 <const char *>protocol if protocol is not None else NULL))
diff --git a/efl/ecore/efl.ecore_file_monitor.pxi b/efl/ecore/efl.ecore_file_monitor.pxi
index 55e4c1a..10df57e 100644
--- a/efl/ecore/efl.ecore_file_monitor.pxi
+++ b/efl/ecore/efl.ecore_file_monitor.pxi
@@ -18,7 +18,7 @@
18from cpython cimport PyUnicode_AsUTF8String 18from cpython cimport PyUnicode_AsUTF8String
19 19
20 20
21cdef void _file_monitor_cb(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const_char *path) with gil: 21cdef void _file_monitor_cb(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path) with gil:
22 obj = <FileMonitor>data 22 obj = <FileMonitor>data
23 try: 23 try:
24 obj._exec_monitor(event, path) 24 obj._exec_monitor(event, path)
@@ -74,7 +74,7 @@ cdef class FileMonitor(object):
74 74
75 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path) 75 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path)
76 self.mon = ecore_file_monitor_add( 76 self.mon = ecore_file_monitor_add(
77 <const_char *>path if path is not None else NULL, 77 <const char *>path if path is not None else NULL,
78 _file_monitor_cb, <void *>self) 78 _file_monitor_cb, <void *>self)
79 if not self.mon: 79 if not self.mon:
80 raise SystemError("could not monitor '%s'" % (path)) 80 raise SystemError("could not monitor '%s'" % (path))
@@ -98,7 +98,7 @@ cdef class FileMonitor(object):
98 (self.__class__.__name__, <uintptr_t><void *>self, 98 (self.__class__.__name__, <uintptr_t><void *>self,
99 self.monitor_cb, self.args, self.kargs, PY_REFCOUNT(self)) 99 self.monitor_cb, self.args, self.kargs, PY_REFCOUNT(self))
100 100
101 cdef object _exec_monitor(self, Ecore_File_Event event, const_char *path): 101 cdef object _exec_monitor(self, Ecore_File_Event event, const char *path):
102 if self.monitor_cb: 102 if self.monitor_cb:
103 return self.monitor_cb(event, _ctouni(path), *self.args, **self.kargs) 103 return self.monitor_cb(event, _ctouni(path), *self.args, **self.kargs)
104 return 0 104 return 0
diff --git a/efl/edje/efl.edje.pyx b/efl/edje/efl.edje.pyx
index a0e2322..1203f02 100644
--- a/efl/edje/efl.edje.pyx
+++ b/efl/edje/efl.edje.pyx
@@ -157,7 +157,7 @@ def thaw():
157 157
158def fontset_append_set(fonts): 158def fontset_append_set(fonts):
159 if isinstance(fonts, unicode): fonts = PyUnicode_AsUTF8String(fonts) 159 if isinstance(fonts, unicode): fonts = PyUnicode_AsUTF8String(fonts)
160 edje_fontset_append_set(<const_char *>fonts if fonts is not None else NULL) 160 edje_fontset_append_set(<const char *>fonts if fonts is not None else NULL)
161 161
162 162
163def fontset_append_get(): 163def fontset_append_get():
@@ -168,7 +168,7 @@ def file_collection_list(file):
168 cdef Eina_List *lst 168 cdef Eina_List *lst
169 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file) 169 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file)
170 lst = edje_file_collection_list( 170 lst = edje_file_collection_list(
171 <const_char *>file if file is not None else NULL) 171 <const char *>file if file is not None else NULL)
172 ret = eina_list_strings_to_python_list(lst) 172 ret = eina_list_strings_to_python_list(lst)
173 edje_file_collection_list_free(lst) 173 edje_file_collection_list_free(lst)
174 return ret 174 return ret
@@ -178,8 +178,8 @@ def file_group_exists(file, group):
178 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file) 178 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file)
179 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group) 179 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group)
180 return bool(edje_file_group_exists( 180 return bool(edje_file_group_exists(
181 <const_char *>file if file is not None else NULL, 181 <const char *>file if file is not None else NULL,
182 <const_char *>group if group is not None else NULL)) 182 <const char *>group if group is not None else NULL))
183 183
184 184
185def file_data_get(file, key): 185def file_data_get(file, key):
@@ -187,8 +187,8 @@ def file_data_get(file, key):
187 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file) 187 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file)
188 if isinstance(key, unicode): key = PyUnicode_AsUTF8String(key) 188 if isinstance(key, unicode): key = PyUnicode_AsUTF8String(key)
189 s = edje_file_data_get( 189 s = edje_file_data_get(
190 <const_char *>file if file is not None else NULL, 190 <const char *>file if file is not None else NULL,
191 <const_char *>key if key is not None else NULL) 191 <const char *>key if key is not None else NULL)
192 ret = _touni(s) 192 ret = _touni(s)
193 libc.stdlib.free(s) 193 libc.stdlib.free(s)
194 return ret 194 return ret
@@ -236,7 +236,7 @@ def color_class_set(color_class,
236 if isinstance(color_class, unicode): 236 if isinstance(color_class, unicode):
237 color_class = PyUnicode_AsUTF8String(color_class) 237 color_class = PyUnicode_AsUTF8String(color_class)
238 edje_color_class_set( 238 edje_color_class_set(
239 <const_char *>color_class if color_class is not None else NULL, 239 <const char *>color_class if color_class is not None else NULL,
240 r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3) 240 r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3)
241 241
242 242
@@ -247,7 +247,7 @@ def color_class_get(color_class):
247 if isinstance(color_class, unicode): 247 if isinstance(color_class, unicode):
248 color_class = PyUnicode_AsUTF8String(color_class) 248 color_class = PyUnicode_AsUTF8String(color_class)
249 edje_color_class_get( 249 edje_color_class_get(
250 <const_char *>color_class if color_class is not None else NULL, 250 <const char *>color_class if color_class is not None else NULL,
251 &r, &g, &b, &a, &r2, &g2, &b2, &a2, &r3, &g3, &b3, &a3) 251 &r, &g, &b, &a, &r2, &g2, &b2, &a2, &r3, &g3, &b3, &a3)
252 return (r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3) 252 return (r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3)
253 253
@@ -256,7 +256,7 @@ def color_class_del(color_class):
256 if isinstance(color_class, unicode): 256 if isinstance(color_class, unicode):
257 color_class = PyUnicode_AsUTF8String(color_class) 257 color_class = PyUnicode_AsUTF8String(color_class)
258 edje_color_class_del( 258 edje_color_class_del(
259 <const_char *>color_class if color_class is not None else NULL) 259 <const char *>color_class if color_class is not None else NULL)
260 260
261 261
262def color_class_list(): 262def color_class_list():
@@ -280,15 +280,15 @@ def text_class_set(text_class, font, int size):
280 if isinstance(font, unicode): 280 if isinstance(font, unicode):
281 font = PyUnicode_AsUTF8String(font) 281 font = PyUnicode_AsUTF8String(font)
282 edje_text_class_set( 282 edje_text_class_set(
283 <const_char *>text_class if text_class is not None else NULL, 283 <const char *>text_class if text_class is not None else NULL,
284 <const_char *>font if font is not None else NULL, 284 <const char *>font if font is not None else NULL,
285 size) 285 size)
286 286
287 287
288def text_class_del(text_class): 288def text_class_del(text_class):
289 if isinstance(text_class, unicode): text_class = PyUnicode_AsUTF8String(text_class) 289 if isinstance(text_class, unicode): text_class = PyUnicode_AsUTF8String(text_class)
290 edje_text_class_del( 290 edje_text_class_del(
291 <const_char *>text_class if text_class is not None else NULL) 291 <const char *>text_class if text_class is not None else NULL)
292 292
293 293
294def text_class_list(): 294def text_class_list():
@@ -323,7 +323,7 @@ def extern_object_aspect_set(Object obj, int aspect, int w, int h):
323 323
324 324
325def available_modules_get(): 325def available_modules_get():
326 cdef const_Eina_List *lst 326 cdef const Eina_List *lst
327 lst = edje_available_modules_get() 327 lst = edje_available_modules_get()
328 ret = [] 328 ret = []
329 while lst: 329 while lst:
@@ -335,7 +335,7 @@ def available_modules_get():
335def module_load(name): 335def module_load(name):
336 if isinstance(name, unicode): name = PyUnicode_AsUTF8String(name) 336 if isinstance(name, unicode): name = PyUnicode_AsUTF8String(name)
337 return bool(edje_module_load( 337 return bool(edje_module_load(
338 <const_char *>name if name is not None else NULL)) 338 <const char *>name if name is not None else NULL))
339 339
340 340
341include "efl.edje_message.pxi" 341include "efl.edje_message.pxi"
diff --git a/efl/edje/efl.edje_edit.pyx b/efl/edje/efl.edje_edit.pyx
index 77ed68a..ae548dc 100644
--- a/efl/edje/efl.edje_edit.pyx
+++ b/efl/edje/efl.edje_edit.pyx
@@ -48,7 +48,7 @@ cdef class EdjeEdit(Edje):
48 48
49 # General 49 # General
50 def compiler_get(self): 50 def compiler_get(self):
51 cdef const_char *s = edje_edit_compiler_get(self.obj) 51 cdef const char *s = edje_edit_compiler_get(self.obj)
52 r = _ctouni(s) 52 r = _ctouni(s)
53 if s != NULL: 53 if s != NULL:
54 edje_edit_string_free(s) 54 edje_edit_string_free(s)
@@ -71,17 +71,17 @@ cdef class EdjeEdit(Edje):
71 def group_add(self, name): 71 def group_add(self, name):
72 if isinstance(name, unicode): name = name.encode("UTF-8") 72 if isinstance(name, unicode): name = name.encode("UTF-8")
73 return bool(edje_edit_group_add(self.obj, 73 return bool(edje_edit_group_add(self.obj,
74 <const_char *>name if name is not None else NULL)) 74 <const char *>name if name is not None else NULL))
75 75
76 def group_del(self, name): 76 def group_del(self, name):
77 if isinstance(name, unicode): name = name.encode("UTF-8") 77 if isinstance(name, unicode): name = name.encode("UTF-8")
78 return bool(edje_edit_group_del(self.obj, 78 return bool(edje_edit_group_del(self.obj,
79 <const_char *>name if name is not None else NULL)) 79 <const char *>name if name is not None else NULL))
80 80
81 def group_exist(self, name): 81 def group_exist(self, name):
82 if isinstance(name, unicode): name = name.encode("UTF-8") 82 if isinstance(name, unicode): name = name.encode("UTF-8")
83 return bool(edje_edit_group_exist(self.obj, 83 return bool(edje_edit_group_exist(self.obj,
84 <const_char *>name if name is not None else NULL)) 84 <const char *>name if name is not None else NULL))
85 85
86 # Data 86 # Data
87 property data: 87 property data:
@@ -96,8 +96,8 @@ cdef class EdjeEdit(Edje):
96 96
97 def data_get(self, name): 97 def data_get(self, name):
98 if isinstance(name, unicode): name = name.encode("UTF-8") 98 if isinstance(name, unicode): name = name.encode("UTF-8")
99 cdef const_char *val = edje_edit_data_value_get(self.obj, 99 cdef const char *val = edje_edit_data_value_get(self.obj,
100 <const_char *>name if name is not None else NULL) 100 <const char *>name if name is not None else NULL)
101 r = _ctouni(val) 101 r = _ctouni(val)
102 edje_edit_string_free(val) 102 edje_edit_string_free(val)
103 return r 103 return r
@@ -107,27 +107,27 @@ cdef class EdjeEdit(Edje):
107 if isinstance(value, unicode): value = value.encode("UTF-8") 107 if isinstance(value, unicode): value = value.encode("UTF-8")
108 108
109 return bool(edje_edit_data_value_set(self.obj, 109 return bool(edje_edit_data_value_set(self.obj,
110 <const_char *>name if name is not None else NULL, 110 <const char *>name if name is not None else NULL,
111 <const_char *>value if value is not None else NULL)) 111 <const char *>value if value is not None else NULL))
112 112
113 def data_add(self, name, value): 113 def data_add(self, name, value):
114 if isinstance(name, unicode): name = name.encode("UTF-8") 114 if isinstance(name, unicode): name = name.encode("UTF-8")
115 if isinstance(value, unicode): value = value.encode("UTF-8") 115 if isinstance(value, unicode): value = value.encode("UTF-8")
116 return bool(edje_edit_data_add(self.obj, 116 return bool(edje_edit_data_add(self.obj,
117 <const_char *>name if name is not None else NULL, 117 <const char *>name if name is not None else NULL,
118 <const_char *>value if value is not None else NULL)) 118 <const char *>value if value is not None else NULL))
119 119
120 def data_rename(self, old, new): 120 def data_rename(self, old, new):
121 if isinstance(old, unicode): old = old.encode("UTF-8") 121 if isinstance(old, unicode): old = old.encode("UTF-8")
122 if isinstance(new, unicode): new = new.encode("UTF-8") 122 if isinstance(new, unicode): new = new.encode("UTF-8")
123 return bool(edje_edit_data_name_set(self.obj, 123 return bool(edje_edit_data_name_set(self.obj,
124 <const_char *>old if old is not None else NULL, 124 <const char *>old if old is not None else NULL,
125 <const_char *>new if new is not None else NULL)) 125 <const char *>new if new is not None else NULL))
126 126
127 def data_del(self, name): 127 def data_del(self, name):
128 if isinstance(name, unicode): name = name.encode("UTF-8") 128 if isinstance(name, unicode): name = name.encode("UTF-8")
129 return bool(edje_edit_data_del(self.obj, 129 return bool(edje_edit_data_del(self.obj,
130 <const_char *>name if name is not None else NULL)) 130 <const char *>name if name is not None else NULL))
131 131
132 # Group Data 132 # Group Data
133 property group_data: 133 property group_data:
@@ -141,10 +141,10 @@ cdef class EdjeEdit(Edje):
141 return ret 141 return ret
142 142
143 def group_data_get(self, name): 143 def group_data_get(self, name):
144 cdef const_char *val 144 cdef const char *val
145 if isinstance(name, unicode): name = name.encode("UTF-8") 145 if isinstance(name, unicode): name = name.encode("UTF-8")
146 val = edje_edit_group_data_value_get(self.obj, 146 val = edje_edit_group_data_value_get(self.obj,
147 <const_char *>name if name is not None else NULL) 147 <const char *>name if name is not None else NULL)
148 r = _ctouni(val) 148 r = _ctouni(val)
149 edje_edit_string_free(val) 149 edje_edit_string_free(val)
150 return r 150 return r
@@ -153,27 +153,27 @@ cdef class EdjeEdit(Edje):
153 if isinstance(name, unicode): name = name.encode("UTF-8") 153 if isinstance(name, unicode): name = name.encode("UTF-8")
154 if isinstance(value, unicode): value = value.encode("UTF-8") 154 if isinstance(value, unicode): value = value.encode("UTF-8")
155 return bool(edje_edit_group_data_value_set(self.obj, 155 return bool(edje_edit_group_data_value_set(self.obj,
156 <const_char *>name if name is not None else NULL, 156 <const char *>name if name is not None else NULL,
157 <const_char *>value if value is not None else NULL)) 157 <const char *>value if value is not None else NULL))
158 158
159 def group_data_add(self, name, value): 159 def group_data_add(self, name, value):
160 if isinstance(name, unicode): name = name.encode("UTF-8") 160 if isinstance(name, unicode): name = name.encode("UTF-8")
161 if isinstance(value, unicode): value = value.encode("UTF-8") 161 if isinstance(value, unicode): value = value.encode("UTF-8")
162 return bool(edje_edit_group_data_add(self.obj, 162 return bool(edje_edit_group_data_add(self.obj,
163 <const_char *>name if name is not None else NULL, 163 <const char *>name if name is not None else NULL,
164 <const_char *>value if value is not None else NULL)) 164 <const char *>value if value is not None else NULL))
165 165
166 def group_data_rename(self, old, new): 166 def group_data_rename(self, old, new):
167 if isinstance(old, unicode): old = old.encode("UTF-8") 167 if isinstance(old, unicode): old = old.encode("UTF-8")
168 if isinstance(new, unicode): new = new.encode("UTF-8") 168 if isinstance(new, unicode): new = new.encode("UTF-8")
169 return bool(edje_edit_group_data_name_set(self.obj, 169 return bool(edje_edit_group_data_name_set(self.obj,
170 <const_char *>old if old is not None else NULL, 170 <const char *>old if old is not None else NULL,
171 <const_char *>new if new is not None else NULL)) 171 <const char *>new if new is not None else NULL))
172 172
173 def group_data_del(self, name): 173 def group_data_del(self, name):
174 if isinstance(name, unicode): name = name.encode("UTF-8") 174 if isinstance(name, unicode): name = name.encode("UTF-8")
175 return bool(edje_edit_group_data_del(self.obj, 175 return bool(edje_edit_group_data_del(self.obj,
176 <const_char *>name if name is not None else NULL)) 176 <const char *>name if name is not None else NULL))
177 177
178 # Text Style 178 # Text Style
179 property text_styles: 179 property text_styles:
@@ -190,12 +190,12 @@ cdef class EdjeEdit(Edje):
190 def text_style_add(self, name): 190 def text_style_add(self, name):
191 if isinstance(name, unicode): name = name.encode("UTF-8") 191 if isinstance(name, unicode): name = name.encode("UTF-8")
192 return bool(edje_edit_style_add(self.obj, 192 return bool(edje_edit_style_add(self.obj,
193 <const_char *>name if name is not None else NULL)) 193 <const char *>name if name is not None else NULL))
194 194
195 def text_style_del(self, name): 195 def text_style_del(self, name):
196 if isinstance(name, unicode): name = name.encode("UTF-8") 196 if isinstance(name, unicode): name = name.encode("UTF-8")
197 edje_edit_style_del(self.obj, 197 edje_edit_style_del(self.obj,
198 <const_char *>name if name is not None else NULL) 198 <const char *>name if name is not None else NULL)
199 return True 199 return True
200 200
201 # Color Classes 201 # Color Classes
@@ -213,12 +213,12 @@ cdef class EdjeEdit(Edje):
213 def color_class_add(self, name): 213 def color_class_add(self, name):
214 if isinstance(name, unicode): name = name.encode("UTF-8") 214 if isinstance(name, unicode): name = name.encode("UTF-8")
215 return bool(edje_edit_color_class_add(self.obj, 215 return bool(edje_edit_color_class_add(self.obj,
216 <const_char *>name if name is not None else NULL)) 216 <const char *>name if name is not None else NULL))
217 217
218 def color_class_del(self, name): 218 def color_class_del(self, name):
219 if isinstance(name, unicode): name = name.encode("UTF-8") 219 if isinstance(name, unicode): name = name.encode("UTF-8")
220 return bool(edje_edit_color_class_del(self.obj, 220 return bool(edje_edit_color_class_del(self.obj,
221 <const_char *>name if name is not None else NULL)) 221 <const char *>name if name is not None else NULL))
222 222
223 # Externals 223 # Externals
224 property externals: 224 property externals:
@@ -232,12 +232,12 @@ cdef class EdjeEdit(Edje):
232 def external_add(self, name): 232 def external_add(self, name):
233 if isinstance(name, unicode): name = name.encode("UTF-8") 233 if isinstance(name, unicode): name = name.encode("UTF-8")
234 return bool(edje_edit_external_add(self.obj, 234 return bool(edje_edit_external_add(self.obj,
235 <const_char *>name if name is not None else NULL)) 235 <const char *>name if name is not None else NULL))
236 236
237 def external_del(self, name): 237 def external_del(self, name):
238 if isinstance(name, unicode): name = name.encode("UTF-8") 238 if isinstance(name, unicode): name = name.encode("UTF-8")
239 return bool(edje_edit_external_del(self.obj, 239 return bool(edje_edit_external_del(self.obj,
240 <const_char *>name if name is not None else NULL)) 240 <const char *>name if name is not None else NULL))
241 241
242 # Fonts 242 # Fonts
243 property fonts: 243 property fonts:
@@ -252,13 +252,13 @@ cdef class EdjeEdit(Edje):
252 if isinstance(font, unicode): font = font.encode("UTF-8") 252 if isinstance(font, unicode): font = font.encode("UTF-8")
253 if isinstance(alias, unicode): alias = alias.encode("UTF-8") 253 if isinstance(alias, unicode): alias = alias.encode("UTF-8")
254 return bool(edje_edit_font_add(self.obj, 254 return bool(edje_edit_font_add(self.obj,
255 <const_char *>font if font is not None else NULL, 255 <const char *>font if font is not None else NULL,
256 <const_char *>alias if alias is not None else NULL)) 256 <const char *>alias if alias is not None else NULL))
257 257
258 def font_del(self, alias): 258 def font_del(self, alias):
259 if isinstance(alias, unicode): alias = alias.encode("UTF-8") 259 if isinstance(alias, unicode): alias = alias.encode("UTF-8")
260 return bool(edje_edit_font_del(self.obj, 260 return bool(edje_edit_font_del(self.obj,
261 <const_char *>alias if alias is not None else NULL)) 261 <const char *>alias if alias is not None else NULL))
262 262
263 # Parts 263 # Parts
264 property parts: 264 property parts:
@@ -278,7 +278,7 @@ cdef class EdjeEdit(Edje):
278 if isinstance(name, unicode): name = name.encode("UTF-8") 278 if isinstance(name, unicode): name = name.encode("UTF-8")
279 if type != EDJE_PART_TYPE_EXTERNAL: 279 if type != EDJE_PART_TYPE_EXTERNAL:
280 return bool(edje_edit_part_add(self.obj, 280 return bool(edje_edit_part_add(self.obj,
281 <const_char *>name if name is not None else NULL, 281 <const char *>name if name is not None else NULL,
282 <Edje_Part_Type>type)) 282 <Edje_Part_Type>type))
283 else: 283 else:
284 return bool(edje_edit_part_external_add(self.obj, name, source)) 284 return bool(edje_edit_part_external_add(self.obj, name, source))
@@ -286,12 +286,12 @@ cdef class EdjeEdit(Edje):
286 def part_del(self, name): 286 def part_del(self, name):
287 if isinstance(name, unicode): name = name.encode("UTF-8") 287 if isinstance(name, unicode): name = name.encode("UTF-8")
288 return bool(edje_edit_part_del(self.obj, 288 return bool(edje_edit_part_del(self.obj,
289 <const_char *>name if name is not None else NULL)) 289 <const char *>name if name is not None else NULL))
290 290
291 def part_exist(self, name): 291 def part_exist(self, name):
292 if isinstance(name, unicode): name = name.encode("UTF-8") 292 if isinstance(name, unicode): name = name.encode("UTF-8")
293 return bool(edje_edit_part_exist(self.obj, 293 return bool(edje_edit_part_exist(self.obj,
294 <const_char *>name if name is not None else NULL)) 294 <const char *>name if name is not None else NULL))
295 295
296 # Images 296 # Images
297 property images: 297 property images:
@@ -305,17 +305,17 @@ cdef class EdjeEdit(Edje):
305 def image_id_get(self, image): 305 def image_id_get(self, image):
306 if isinstance(image, unicode): image = image.encode("UTF-8") 306 if isinstance(image, unicode): image = image.encode("UTF-8")
307 return edje_edit_image_id_get(self.obj, 307 return edje_edit_image_id_get(self.obj,
308 <const_char *>image if image is not None else NULL) 308 <const char *>image if image is not None else NULL)
309 309
310 def image_add(self, path): 310 def image_add(self, path):
311 if isinstance(path, unicode): path = path.encode("UTF-8") 311 if isinstance(path, unicode): path = path.encode("UTF-8")
312 return bool(edje_edit_image_add(self.obj, 312 return bool(edje_edit_image_add(self.obj,
313 <const_char *>path if path is not None else NULL)) 313 <const char *>path if path is not None else NULL))
314 314
315 def image_del(self, image): 315 def image_del(self, image):
316 if isinstance(image, unicode): image = image.encode("UTF-8") 316 if isinstance(image, unicode): image = image.encode("UTF-8")
317 return bool(edje_edit_image_del(self.obj, 317 return bool(edje_edit_image_del(self.obj,
318 <const_char *>image if image is not None else NULL)) 318 <const char *>image if image is not None else NULL))
319 319
320 # Programs 320 # Programs
321 property programs: 321 property programs:
@@ -335,17 +335,17 @@ cdef class EdjeEdit(Edje):
335 def program_add(self, name): 335 def program_add(self, name):
336 if isinstance(name, unicode): name = name.encode("UTF-8") 336 if isinstance(name, unicode): name = name.encode("UTF-8")
337 return bool(edje_edit_program_add(self.obj, 337 return bool(edje_edit_program_add(self.obj,
338 <const_char *>name if name is not None else NULL)) 338 <const char *>name if name is not None else NULL))
339 339
340 def program_del(self, name): 340 def program_del(self, name):
341 if isinstance(name, unicode): name = name.encode("UTF-8") 341 if isinstance(name, unicode): name = name.encode("UTF-8")
342 return bool(edje_edit_program_del(self.obj, 342 return bool(edje_edit_program_del(self.obj,
343 <const_char *>name if name is not None else NULL)) 343 <const char *>name if name is not None else NULL))
344 344
345 def program_exist(self, name): 345 def program_exist(self, name):
346 if isinstance(name, unicode): name = name.encode("UTF-8") 346 if isinstance(name, unicode): name = name.encode("UTF-8")
347 return bool(edje_edit_program_exist(self.obj, 347 return bool(edje_edit_program_exist(self.obj,
348 <const_char *>name if name is not None else NULL)) 348 <const char *>name if name is not None else NULL))
349 """ 349 """
350 property error: 350 property error:
351 def __get__(self): 351 def __get__(self):
@@ -378,7 +378,7 @@ cdef class EdjeEdit(Edje):
378 378
379 property script_errors: 379 property script_errors:
380 def __get__(self): 380 def __get__(self):
381 cdef const_Eina_List *lst 381 cdef const Eina_List *lst
382 cdef Edje_Edit_Script_Error *se 382 cdef Edje_Edit_Script_Error *se
383 ret = [] 383 ret = []
384 lst = edje_edit_script_error_list_get(self.obj) 384 lst = edje_edit_script_error_list_get(self.obj)
@@ -396,7 +396,7 @@ cdef class EdjeEdit(Edje):
396 396
397cdef class Text_Style(object): 397cdef class Text_Style(object):
398 cdef EdjeEdit edje 398 cdef EdjeEdit edje
399 cdef const_char *name 399 cdef const char *name
400 400
401 def __init__(self, EdjeEdit e not None, name not None): 401 def __init__(self, EdjeEdit e not None, name not None):
402 if isinstance(name, unicode): name = name.encode("UTF-8") 402 if isinstance(name, unicode): name = name.encode("UTF-8")
@@ -420,17 +420,17 @@ cdef class Text_Style(object):
420 def tag_add(self, name not None): 420 def tag_add(self, name not None):
421 if isinstance(name, unicode): name = name.encode("UTF-8") 421 if isinstance(name, unicode): name = name.encode("UTF-8")
422 return bool(edje_edit_style_tag_add(self.edje.obj, self.name, 422 return bool(edje_edit_style_tag_add(self.edje.obj, self.name,
423 <const_char *>name)) 423 <const char *>name))
424 424
425 def tag_del(self, name not None): 425 def tag_del(self, name not None):
426 if isinstance(name, unicode): name = name.encode("UTF-8") 426 if isinstance(name, unicode): name = name.encode("UTF-8")
427 edje_edit_style_tag_del(self.edje.obj, self.name, <const_char *>name) 427 edje_edit_style_tag_del(self.edje.obj, self.name, <const char *>name)
428 return True 428 return True
429 429
430 430
431cdef class Text_Style_Tag(object): 431cdef class Text_Style_Tag(object):
432 cdef Text_Style text_style 432 cdef Text_Style text_style
433 cdef const_char *name 433 cdef const char *name
434 434
435 def __init__(self, Text_Style text_style not None, name not None): 435 def __init__(self, Text_Style text_style not None, name not None):
436 if isinstance(name, unicode): name = name.encode("UTF-8") 436 if isinstance(name, unicode): name = name.encode("UTF-8")
@@ -451,13 +451,13 @@ cdef class Text_Style_Tag(object):
451 if isinstance(newname, unicode): newname = newname.encode("UTF-8") 451 if isinstance(newname, unicode): newname = newname.encode("UTF-8")
452 edje_edit_style_tag_name_set(self.text_style.edje.obj, 452 edje_edit_style_tag_name_set(self.text_style.edje.obj,
453 self.text_style.name, self.name, 453 self.text_style.name, self.name,
454 <const_char *>newname) 454 <const char *>newname)
455 eina_stringshare_replace(&self.name, <const_char *>newname) 455 eina_stringshare_replace(&self.name, <const char *>newname)
456 return True 456 return True
457 457
458 property value: 458 property value:
459 def __get__(self): 459 def __get__(self):
460 cdef const_char *val 460 cdef const char *val
461 val = edje_edit_style_tag_value_get(self.text_style.edje.obj, 461 val = edje_edit_style_tag_value_get(self.text_style.edje.obj,
462 self.text_style.name, self.name) 462 self.text_style.name, self.name)
463 ret = _ctouni(val) 463 ret = _ctouni(val)
@@ -467,13 +467,13 @@ cdef class Text_Style_Tag(object):
467 if isinstance(value, unicode): value = value.encode("UTF-8") 467 if isinstance(value, unicode): value = value.encode("UTF-8")
468 edje_edit_style_tag_value_set(self.text_style.edje.obj, 468 edje_edit_style_tag_value_set(self.text_style.edje.obj,
469 self.text_style.name, self.name, 469 self.text_style.name, self.name,
470 <const_char *>value if value is not None else NULL) 470 <const char *>value if value is not None else NULL)
471 471
472 472
473 473
474cdef class Color_Class(object): 474cdef class Color_Class(object):
475 cdef EdjeEdit edje 475 cdef EdjeEdit edje
476 cdef const_char *name 476 cdef const char *name
477 477
478 def __init__(self, EdjeEdit e not None, name not None): 478 def __init__(self, EdjeEdit e not None, name not None):
479 if isinstance(name, unicode): name = name.encode("UTF-8") 479 if isinstance(name, unicode): name = name.encode("UTF-8")
@@ -494,10 +494,10 @@ cdef class Color_Class(object):
494 cdef Eina_Bool ret 494 cdef Eina_Bool ret
495 if isinstance(newname, unicode): newname = newname.encode("UTF-8") 495 if isinstance(newname, unicode): newname = newname.encode("UTF-8")
496 ret = edje_edit_color_class_name_set(self.edje.obj, self.name, 496 ret = edje_edit_color_class_name_set(self.edje.obj, self.name,
497 <const_char *>newname) 497 <const char *>newname)
498 if ret == 0: 498 if ret == 0:
499 return False 499 return False
500 eina_stringshare_replace(&self.name, <const_char *>newname) 500 eina_stringshare_replace(&self.name, <const char *>newname)
501 return True 501 return True
502 502
503 def colors_get(self): 503 def colors_get(self):
diff --git a/efl/edje/efl.edje_edit_group.pxi b/efl/edje/efl.edje_edit_group.pxi
index 70fba43..7423bcb 100644
--- a/efl/edje/efl.edje_edit_group.pxi
+++ b/efl/edje/efl.edje_edit_group.pxi
@@ -51,5 +51,5 @@ cdef class Group(object):
51 51
52 def rename(self, name not None): 52 def rename(self, name not None):
53 if isinstance(name, unicode): name = name.encode("UTF-8") 53 if isinstance(name, unicode): name = name.encode("UTF-8")
54 return bool(edje_edit_group_name_set(self.edje.obj, <const_char *>name)) 54 return bool(edje_edit_group_name_set(self.edje.obj, <const char *>name))
55 55
diff --git a/efl/edje/efl.edje_edit_part.pxi b/efl/edje/efl.edje_edit_part.pxi
index 35dc6ea..84c5b41 100644
--- a/efl/edje/efl.edje_edit_part.pxi
+++ b/efl/edje/efl.edje_edit_part.pxi
@@ -18,7 +18,7 @@
18 18
19cdef class Part(object): 19cdef class Part(object):
20 cdef EdjeEdit edje 20 cdef EdjeEdit edje
21 cdef const_char *name 21 cdef const char *name
22 22
23 def __init__(self, EdjeEdit e not None, name not None): 23 def __init__(self, EdjeEdit e not None, name not None):
24 if isinstance(name, unicode): name = name.encode("UTF-8") 24 if isinstance(name, unicode): name = name.encode("UTF-8")
@@ -38,15 +38,15 @@ cdef class Part(object):
38 cdef Eina_Bool ret 38 cdef Eina_Bool ret
39 if isinstance(newname, unicode): newname = newname.encode("UTF-8") 39 if isinstance(newname, unicode): newname = newname.encode("UTF-8")
40 ret = edje_edit_part_name_set(self.edje.obj, self.name, 40 ret = edje_edit_part_name_set(self.edje.obj, self.name,
41 <const_char *>newname if newname is not None else NULL) 41 <const char *>newname if newname is not None else NULL)
42 if ret == 0: 42 if ret == 0:
43 return False 43 return False
44 eina_stringshare_replace(&self.name, <const_char *>newname) 44 eina_stringshare_replace(&self.name, <const char *>newname)
45 return True 45 return True
46 46
47 def above_get(self): 47 def above_get(self):
48 cdef: 48 cdef:
49 const_char *part 49 const char *part
50 object ret 50 object ret
51 part = edje_edit_part_above_get(self.edje.obj, self.name) 51 part = edje_edit_part_above_get(self.edje.obj, self.name)
52 ret = _ctouni(part) 52 ret = _ctouni(part)
@@ -55,7 +55,7 @@ cdef class Part(object):
55 55
56 def below_get(self): 56 def below_get(self):
57 cdef: 57 cdef:
58 const_char *part 58 const char *part
59 object ret 59 object ret
60 part = edje_edit_part_below_get(self.edje.obj, self.name) 60 part = edje_edit_part_below_get(self.edje.obj, self.name)
61 ret = _ctouni(part) 61 ret = _ctouni(part)
@@ -88,30 +88,30 @@ cdef class Part(object):
88 def state_add(self, sname, double value=0.0): 88 def state_add(self, sname, double value=0.0):
89 if isinstance(sname, unicode): sname = sname.encode("UTF-8") 89 if isinstance(sname, unicode): sname = sname.encode("UTF-8")
90 return bool(edje_edit_state_add(self.edje.obj, self.name, 90 return bool(edje_edit_state_add(self.edje.obj, self.name,
91 <const_char *>sname if sname is not None else NULL, 91 <const char *>sname if sname is not None else NULL,
92 value)) 92 value))
93 93
94 def state_del(self, sname, double value=0.0): 94 def state_del(self, sname, double value=0.0):
95 if isinstance(sname, unicode): sname = sname.encode("UTF-8") 95 if isinstance(sname, unicode): sname = sname.encode("UTF-8")
96 return bool(edje_edit_state_del(self.edje.obj, self.name, 96 return bool(edje_edit_state_del(self.edje.obj, self.name,
97 <const_char *>sname if sname is not None else NULL, 97 <const char *>sname if sname is not None else NULL,
98 value)) 98 value))
99 99
100 def state_exist(self, sname, double value=0.0): 100 def state_exist(self, sname, double value=0.0):
101 if isinstance(sname, unicode): sname = sname.encode("UTF-8") 101 if isinstance(sname, unicode): sname = sname.encode("UTF-8")
102 return bool(edje_edit_state_exist(self.edje.obj, self.name, 102 return bool(edje_edit_state_exist(self.edje.obj, self.name,
103 <const_char *>sname if sname is not None else NULL, 103 <const char *>sname if sname is not None else NULL,
104 value)) 104 value))
105 105
106 def state_copy(self, sfrom, double vfrom, sto, double vto): 106 def state_copy(self, sfrom, double vfrom, sto, double vto):
107 if isinstance(sfrom, unicode): sfrom = sfrom.encode("UTF-8") 107 if isinstance(sfrom, unicode): sfrom = sfrom.encode("UTF-8")
108 if isinstance(sto, unicode): sto = sto.encode("UTF-8") 108 if isinstance(sto, unicode): sto = sto.encode("UTF-8")
109 return bool(edje_edit_state_copy(self.edje.obj, self.name, 109 return bool(edje_edit_state_copy(self.edje.obj, self.name,
110 <const_char *>sfrom if sfrom is not None else NULL, vfrom, 110 <const char *>sfrom if sfrom is not None else NULL, vfrom,
111 <const_char *>sto if sto is not None else NULL, vto)) 111 <const char *>sto if sto is not None else NULL, vto))
112 112
113 def state_selected_get(self): 113 def state_selected_get(self):
114 cdef const_char *sel 114 cdef const char *sel
115 cdef double val 115 cdef double val
116 sel = edje_edit_part_selected_state_get(self.edje.obj, self.name, &val) 116 sel = edje_edit_part_selected_state_get(self.edje.obj, self.name, &val)
117 if sel == NULL: return None 117 if sel == NULL: return None
@@ -123,12 +123,12 @@ cdef class Part(object):
123 def state_selected_set(self, state, double value=0.0): 123 def state_selected_set(self, state, double value=0.0):
124 if isinstance(state, unicode): state = state.encode("UTF-8") 124 if isinstance(state, unicode): state = state.encode("UTF-8")
125 edje_edit_part_selected_state_set(self.edje.obj, self.name, 125 edje_edit_part_selected_state_set(self.edje.obj, self.name,
126 <const_char *>state if state is not None else NULL, 126 <const char *>state if state is not None else NULL,
127 value) 127 value)
128 128
129 property clip_to: 129 property clip_to:
130 def __get__(self): 130 def __get__(self):
131 cdef const_char *clipper 131 cdef const char *clipper
132 clipper = edje_edit_part_clip_to_get(self.edje.obj, self.name) 132 clipper = edje_edit_part_clip_to_get(self.edje.obj, self.name)
133 ret = _ctouni(clipper) 133 ret = _ctouni(clipper)
134 edje_edit_string_free(clipper) 134 edje_edit_string_free(clipper)
@@ -137,14 +137,14 @@ cdef class Part(object):
137 def __set__(self, clipper): 137 def __set__(self, clipper):
138 if isinstance(clipper, unicode): clipper = clipper.encode("UTF-8") 138 if isinstance(clipper, unicode): clipper = clipper.encode("UTF-8")
139 edje_edit_part_clip_to_set(self.edje.obj, self.name, 139 edje_edit_part_clip_to_set(self.edje.obj, self.name,
140 <const_char *>clipper if clipper is not None else NULL) 140 <const char *>clipper if clipper is not None else NULL)
141 141
142 def __del__(self): 142 def __del__(self):
143 edje_edit_part_clip_to_set(self.edje.obj, self.name, NULL) 143 edje_edit_part_clip_to_set(self.edje.obj, self.name, NULL)
144 144
145 property source: 145 property source:
146 def __get__(self): 146 def __get__(self):
147 cdef const_char *source 147 cdef const char *source
148 source = edje_edit_part_source_get(self.edje.obj, self.name) 148 source = edje_edit_part_source_get(self.edje.obj, self.name)
149 ret = _ctouni(source) 149 ret = _ctouni(source)
150 edje_edit_string_free(source) 150 edje_edit_string_free(source)
@@ -153,7 +153,7 @@ cdef class Part(object):
153 def __set__(self, source): 153 def __set__(self, source):
154 if isinstance(source, unicode): source = source.encode("UTF-8") 154 if isinstance(source, unicode): source = source.encode("UTF-8")
155 edje_edit_part_source_set(self.edje.obj, self.name, 155 edje_edit_part_source_set(self.edje.obj, self.name,
156 <const_char *>source if source is not None else NULL) 156 <const char *>source if source is not None else NULL)
157 157
158 def __del__(self): 158 def __del__(self):
159 edje_edit_part_source_set(self.edje.obj, self.name, NULL) 159 edje_edit_part_source_set(self.edje.obj, self.name, NULL)
@@ -234,7 +234,7 @@ cdef class Part(object):
234 234
235 property drag_confine: 235 property drag_confine:
236 def __get__(self): 236 def __get__(self):
237 cdef const_char *confine 237 cdef const char *confine
238 confine = edje_edit_part_drag_confine_get(self.edje.obj, self.name) 238 confine = edje_edit_part_drag_confine_get(self.edje.obj, self.name)
239 ret = _ctouni(confine) 239 ret = _ctouni(confine)
240 edje_edit_string_free(confine) 240 edje_edit_string_free(confine)
@@ -243,11 +243,11 @@ cdef class Part(object):
243 def __set__(self, confine): 243 def __set__(self, confine):
244 if isinstance(confine, unicode): confine = confine.encode("UTF-8") 244 if isinstance(confine, unicode): confine = confine.encode("UTF-8")
245 edje_edit_part_drag_confine_set(self.edje.obj, self.name, 245 edje_edit_part_drag_confine_set(self.edje.obj, self.name,
246 <const_char *>confine if confine is not None else NULL) 246 <const char *>confine if confine is not None else NULL)
247 247
248 property drag_event: 248 property drag_event:
249 def __get__(self): 249 def __get__(self):
250 cdef const_char *event 250 cdef const char *event
251 event = edje_edit_part_drag_event_get(self.edje.obj, self.name) 251 event = edje_edit_part_drag_event_get(self.edje.obj, self.name)
252 ret = _ctouni(event) 252 ret = _ctouni(event)
253 edje_edit_string_free(event) 253 edje_edit_string_free(event)
@@ -256,13 +256,13 @@ cdef class Part(object):
256 def __set__(self, event): 256 def __set__(self, event):
257 if isinstance(event, unicode): event = event.encode("UTF-8") 257 if isinstance(event, unicode): event = event.encode("UTF-8")
258 edje_edit_part_drag_event_set(self.edje.obj, self.name, 258 edje_edit_part_drag_event_set(self.edje.obj, self.name,
259 <const_char *>event if event is not None else NULL) 259 <const char *>event if event is not None else NULL)
260 260
261 property api: 261 property api:
262 def __get__(self): 262 def __get__(self):
263 cdef: 263 cdef:
264 const_char *name 264 const char *name
265 const_char *desc 265 const char *desc
266 name = edje_edit_part_api_name_get(self.edje.obj, self.name) 266 name = edje_edit_part_api_name_get(self.edje.obj, self.name)
267 desc = edje_edit_part_api_description_get(self.edje.obj, self.name) 267 desc = edje_edit_part_api_description_get(self.edje.obj, self.name)
268 n, d = _ctouni(name), _ctouni(desc) 268 n, d = _ctouni(name), _ctouni(desc)
@@ -276,6 +276,6 @@ cdef class Part(object):
276 if isinstance(name, unicode): name = name.encode("UTF-8") 276 if isinstance(name, unicode): name = name.encode("UTF-8")
277 if isinstance(desc, unicode): desc = desc.encode("UTF-8") 277 if isinstance(desc, unicode): desc = desc.encode("UTF-8")
278 edje_edit_part_api_name_set(self.edje.obj, self.name, 278 edje_edit_part_api_name_set(self.edje.obj, self.name,
279 <const_char *>name if name is not None else NULL) 279 <const char *>name if name is not None else NULL)
280 edje_edit_part_api_description_set(self.edje.obj, self.name, 280 edje_edit_part_api_description_set(self.edje.obj, self.name,
281 <const_char *>desc if desc is not None else NULL) 281 <const char *>desc if desc is not None else NULL)
diff --git a/efl/edje/efl.edje_edit_part_state.pxi b/efl/edje/efl.edje_edit_part_state.pxi
index bcd7be5..149de2c 100644
--- a/efl/edje/efl.edje_edit_part_state.pxi
+++ b/efl/edje/efl.edje_edit_part_state.pxi
@@ -19,7 +19,7 @@
19cdef class State: 19cdef class State:
20 cdef EdjeEdit edje 20 cdef EdjeEdit edje
21 cdef object part 21 cdef object part
22 cdef const_char *name 22 cdef const char *name
23 cdef object part_obj 23 cdef object part_obj
24 cdef object value 24 cdef object value
25 25
@@ -51,11 +51,11 @@ cdef class State:
51 if isinstance(new_name, unicode): new_name = new_name.encode("UTF-8") 51 if isinstance(new_name, unicode): new_name = new_name.encode("UTF-8")
52 ret = edje_edit_state_name_set(self.edje.obj, self.part, 52 ret = edje_edit_state_name_set(self.edje.obj, self.part,
53 self.name, self.value, 53 self.name, self.value,
54 <const_char *>new_name if new_name is not None else NULL, 54 <const char *>new_name if new_name is not None else NULL,
55 new_value if new_value is not None else self.value) 55 new_value if new_value is not None else self.value)
56 if ret == 0: 56 if ret == 0:
57 return False 57 return False
58 eina_stringshare_replace(&self.name, <const_char *>new_name) 58 eina_stringshare_replace(&self.name, <const char *>new_name)
59 return True 59 return True
60 """ 60 """
61 def copy_from(self, from_state, from_value=0.0): 61 def copy_from(self, from_state, from_value=0.0):
@@ -65,8 +65,8 @@ cdef class State:
65 """ 65 """
66 def rel1_to_get(self): 66 def rel1_to_get(self):
67 cdef: 67 cdef:
68 const_char *tx 68 const char *tx
69 const_char *ty 69 const char *ty
70 70
71 tx = edje_edit_state_rel1_to_x_get(self.edje.obj, self.part, self.name, 71 tx = edje_edit_state_rel1_to_x_get(self.edje.obj, self.part, self.name,
72 self.value) 72 self.value)
@@ -188,7 +188,7 @@ cdef class State:
188 self.value, y) 188 self.value, y)
189 189
190 def rel2_to_get(self): 190 def rel2_to_get(self):
191 cdef const_char_ptr tx, ty 191 cdef const char_ptr tx, ty
192 tx = edje_edit_state_rel2_to_x_get(self.edje.obj, self.part, self.name, 192 tx = edje_edit_state_rel2_to_x_get(self.edje.obj, self.part, self.name,
193 self.value) 193 self.value)
194 ty = edje_edit_state_rel2_to_y_get(self.edje.obj, self.part, self.name, 194 ty = edje_edit_state_rel2_to_y_get(self.edje.obj, self.part, self.name,
@@ -505,7 +505,7 @@ cdef class State:
505 edje_edit_state_visible_set(self.edje.obj, self.part, self.name, self.value, 0) 505 edje_edit_state_visible_set(self.edje.obj, self.part, self.name, self.value, 0)
506 506
507 def color_class_get(self): 507 def color_class_get(self):
508 cdef const_char_ptr cc 508 cdef const char_ptr cc
509 cc = edje_edit_state_color_class_get(self.edje.obj, self.part, 509 cc = edje_edit_state_color_class_get(self.edje.obj, self.part,
510 self.name, self.value) 510 self.name, self.value)
511 if cc == NULL: 511 if cc == NULL:
@@ -523,7 +523,7 @@ cdef class State:
523 self.name, self.value, cc) 523 self.name, self.value, cc)
524 524
525 def external_params_get(self): 525 def external_params_get(self):
526 cdef evas.c_evas.const_Eina_List *lst 526 cdef evas.c_evas.const Eina_List *lst
527 ret = [] 527 ret = []
528 lst = edje_edit_state_external_params_list_get(self.edje.obj, self.part, 528 lst = edje_edit_state_external_params_list_get(self.edje.obj, self.part,
529 self.name, self.value) 529 self.name, self.value)
@@ -537,7 +537,7 @@ cdef class State:
537 def external_param_get(self, param): 537 def external_param_get(self, param):
538 cdef c_edje.Edje_External_Param_Type type 538 cdef c_edje.Edje_External_Param_Type type
539 cdef void *value 539 cdef void *value
540 cdef const_char_ptr s 540 cdef const char_ptr s
541 541
542 if not edje_edit_state_external_param_get(self.edje.obj, self.part, 542 if not edje_edit_state_external_param_get(self.edje.obj, self.part,
543 self.name, self.value, param, 543 self.name, self.value, param,
@@ -567,7 +567,7 @@ cdef class State:
567 return None 567 return None
568 568
569 def external_param_set(self, param, value): 569 def external_param_set(self, param, value):
570 cdef const_char_ptr expected 570 cdef const char_ptr expected
571 571
572 if isinstance(value, bool): 572 if isinstance(value, bool):
573 return self.external_param_bool_set(param, value) 573 return self.external_param_bool_set(param, value)
@@ -620,7 +620,7 @@ cdef class State:
620 return value 620 return value
621 621
622 def external_param_string_get(self, param): 622 def external_param_string_get(self, param):
623 cdef const_char_ptr value 623 cdef const char_ptr value
624 624
625 if not edje_edit_state_external_param_string_get( 625 if not edje_edit_state_external_param_string_get(
626 self.edje.obj, self.part, self.name, self.value, param, &value): 626 self.edje.obj, self.part, self.name, self.value, param, &value):
@@ -629,7 +629,7 @@ cdef class State:
629 return value 629 return value
630 630
631 def external_param_choice_get(self, param): 631 def external_param_choice_get(self, param):
632 cdef const_char_ptr value 632 cdef const char_ptr value
633 633
634 if not edje_edit_state_external_param_choice_get( 634 if not edje_edit_state_external_param_choice_get(
635 self.edje.obj, self.part, self.name, self.value, param, &value): 635 self.edje.obj, self.part, self.name, self.value, param, &value):
@@ -664,7 +664,7 @@ cdef class State:
664 self.edje.obj, self.part, self.name, self.value, param, value)) 664 self.edje.obj, self.part, self.name, self.value, param, value))
665 665
666 def text_get(self): 666 def text_get(self):
667 cdef const_char_ptr t 667 cdef const char_ptr t
668 t = edje_edit_state_text_get(self.edje.obj, self.part, self.name, 668 t = edje_edit_state_text_get(self.edje.obj, self.part, self.name,
669 self.value) 669 self.value)
670 if t == NULL: 670 if t == NULL:
@@ -684,7 +684,7 @@ cdef class State:
684 self.text_set(text) 684 self.text_set(text)
685 685
686 def font_get(self): 686 def font_get(self):
687 cdef const_char_ptr f 687 cdef const char_ptr f
688 f = edje_edit_state_font_get(self.edje.obj, self.part, self.name, 688 f = edje_edit_state_font_get(self.edje.obj, self.part, self.name,
689 self.value) 689 self.value)
690 if f == NULL: 690 if f == NULL:
@@ -779,7 +779,7 @@ cdef class State:
779 self.text_fit_set(*value) 779 self.text_fit_set(*value)
780 780
781 def image_get(self): 781 def image_get(self):
782 cdef const_char_ptr img 782 cdef const char_ptr img
783 img = edje_edit_state_image_get(self.edje.obj, self.part, self.name, 783 img = edje_edit_state_image_get(self.edje.obj, self.part, self.name,
784 self.value) 784 self.value)
785 if img == NULL: 785 if img == NULL:
diff --git a/efl/edje/efl.edje_edit_program.pxi b/efl/edje/efl.edje_edit_program.pxi
index aeca1fe..84323d4 100644
--- a/efl/edje/efl.edje_edit_program.pxi
+++ b/efl/edje/efl.edje_edit_program.pxi
@@ -18,7 +18,7 @@
18 18
19cdef class Program(object): 19cdef class Program(object):
20 cdef EdjeEdit edje 20 cdef EdjeEdit edje
21 cdef const_char *name 21 cdef const char *name
22 22
23 def __init__(self, EdjeEdit e not None, name not None): 23 def __init__(self, EdjeEdit e not None, name not None):
24 if isinstance(name, unicode): name = name.encode("UTF-8") 24 if isinstance(name, unicode): name = name.encode("UTF-8")
@@ -38,10 +38,10 @@ cdef class Program(object):
38 cdef Eina_Bool ret 38 cdef Eina_Bool ret
39 if isinstance(newname, unicode): newname = newname.encode("UTF-8") 39 if isinstance(newname, unicode): newname = newname.encode("UTF-8")
40 ret = edje_edit_program_name_set(self.edje.obj, self.name, 40 ret = edje_edit_program_name_set(self.edje.obj, self.name,
41 <const_char *>newname if newname is not None else NULL) 41 <const char *>newname if newname is not None else NULL)
42 if ret == 0: 42 if ret == 0:
43 return False 43 return False
44 eina_stringshare_replace(&self.name, <const_char *>newname) 44 eina_stringshare_replace(&self.name, <const char *>newname)
45 return True 45 return True
46 46
47 def edje_get(self): 47 def edje_get(self):
@@ -53,7 +53,7 @@ cdef class Program(object):
53 # XXX TODO: add (or better convert) all this to properties 53 # XXX TODO: add (or better convert) all this to properties
54 # like is done in Part() 54 # like is done in Part()
55 def source_get(self): 55 def source_get(self):
56 cdef const_char *s 56 cdef const char *s
57 s = edje_edit_program_source_get(self.edje.obj, self.name) 57 s = edje_edit_program_source_get(self.edje.obj, self.name)
58 ret = _ctouni(s) 58 ret = _ctouni(s)
59 edje_edit_string_free(s) 59 edje_edit_string_free(s)
@@ -62,10 +62,10 @@ cdef class Program(object):
62 def source_set(self, source): 62 def source_set(self, source):
63 if isinstance(source, unicode): source = source.encode("UTF-8") 63 if isinstance(source, unicode): source = source.encode("UTF-8")
64 return bool(edje_edit_program_source_set(self.edje.obj, self.name, 64 return bool(edje_edit_program_source_set(self.edje.obj, self.name,
65 <const_char *>source if source is not None else NULL)) 65 <const char *>source if source is not None else NULL))
66 66
67 def signal_get(self): 67 def signal_get(self):
68 cdef const_char *s 68 cdef const char *s
69 s = edje_edit_program_signal_get(self.edje.obj, self.name) 69 s = edje_edit_program_signal_get(self.edje.obj, self.name)
70 ret = _ctouni(s) 70 ret = _ctouni(s)
71 edje_edit_string_free(s) 71 edje_edit_string_free(s)
@@ -74,7 +74,7 @@ cdef class Program(object):
74 def signal_set(self, signal): 74 def signal_set(self, signal):
75 if isinstance(signal, unicode): signal = signal.encode("UTF-8") 75 if isinstance(signal, unicode): signal = signal.encode("UTF-8")
76 return bool(edje_edit_program_signal_set(self.edje.obj, self.name, 76 return bool(edje_edit_program_signal_set(self.edje.obj, self.name,
77 <const_char *>signal if signal is not None else NULL)) 77 <const char *>signal if signal is not None else NULL))
78 78
79 def in_from_get(self): 79 def in_from_get(self):
80 return edje_edit_program_in_from_get(self.edje.obj, self.name) 80 return edje_edit_program_in_from_get(self.edje.obj, self.name)
@@ -106,12 +106,12 @@ cdef class Program(object):
106 def target_add(self, target): 106 def target_add(self, target):
107 if isinstance(target, unicode): target = target.encode("UTF-8") 107 if isinstance(target, unicode): target = target.encode("UTF-8")
108 return bool(edje_edit_program_target_add(self.edje.obj, self.name, 108 return bool(edje_edit_program_target_add(self.edje.obj, self.name,
109 <const_char *>target if target is not None else NULL)) 109 <const char *>target if target is not None else NULL))
110 110
111 def target_del(self, target): 111 def target_del(self, target):
112 if isinstance(target, unicode): target = target.encode("UTF-8") 112 if isinstance(target, unicode): target = target.encode("UTF-8")
113 return bool(edje_edit_program_target_del(self.edje.obj, self.name, 113 return bool(edje_edit_program_target_del(self.edje.obj, self.name,
114 <const_char *>target if target is not None else NULL)) 114 <const char *>target if target is not None else NULL))
115 115
116 def targets_clear(self): 116 def targets_clear(self):
117 return bool(edje_edit_program_targets_clear(self.edje.obj, self.name)) 117 return bool(edje_edit_program_targets_clear(self.edje.obj, self.name))
@@ -126,18 +126,18 @@ cdef class Program(object):
126 def after_add(self, after): 126 def after_add(self, after):
127 if isinstance(after, unicode): after = after.encode("UTF-8") 127 if isinstance(after, unicode): after = after.encode("UTF-8")
128 return bool(edje_edit_program_after_add(self.edje.obj, self.name, 128 return bool(edje_edit_program_after_add(self.edje.obj, self.name,
129 <const_char *>after if after is not None else NULL)) 129 <const char *>after if after is not None else NULL))
130 130
131 def after_del(self, after): 131 def after_del(self, after):
132 if isinstance(after, unicode): after = after.encode("UTF-8") 132 if isinstance(after, unicode): after = after.encode("UTF-8")
133 return bool(edje_edit_program_after_del(self.edje.obj, self.name, 133 return bool(edje_edit_program_after_del(self.edje.obj, self.name,
134 <const_char *>after if after is not None else NULL)) 134 <const char *>after if after is not None else NULL))
135 135
136 def afters_clear(self): 136 def afters_clear(self):
137 return bool(edje_edit_program_afters_clear(self.edje.obj, self.name)) 137 return bool(edje_edit_program_afters_clear(self.edje.obj, self.name))
138 138
139 def state_get(self): 139 def state_get(self):
140 cdef const_char *s 140 cdef const char *s
141 s = edje_edit_program_state_get(self.edje.obj, self.name) 141 s = edje_edit_program_state_get(self.edje.obj, self.name)
142 ret = _ctouni(s) 142 ret = _ctouni(s)
143 edje_edit_string_free(s) 143 edje_edit_string_free(s)
@@ -146,7 +146,7 @@ cdef class Program(object):
146 def state_set(self, state): 146 def state_set(self, state):
147 if isinstance(state, unicode): state = state.encode("UTF-8") 147 if isinstance(state, unicode): state = state.encode("UTF-8")
148 return bool(edje_edit_program_state_set(self.edje.obj, self.name, 148 return bool(edje_edit_program_state_set(self.edje.obj, self.name,
149 <const_char *>state if state is not None else NULL)) 149 <const char *>state if state is not None else NULL))
150 150
151 def value_get(self): 151 def value_get(self):
152 return edje_edit_program_value_get(self.edje.obj, self.name) 152 return edje_edit_program_value_get(self.edje.obj, self.name)
@@ -155,7 +155,7 @@ cdef class Program(object):
155 return bool(edje_edit_program_value_set(self.edje.obj, self.name, v)) 155 return bool(edje_edit_program_value_set(self.edje.obj, self.name, v))
156 156
157 def state2_get(self): 157 def state2_get(self):
158 cdef const_char *s 158 cdef const char *s
159 s = edje_edit_program_state2_get(self.edje.obj, self.name) 159 s = edje_edit_program_state2_get(self.edje.obj, self.name)
160 ret = _ctouni(s) 160 ret = _ctouni(s)
161 edje_edit_string_free(s) 161 edje_edit_string_free(s)
@@ -164,7 +164,7 @@ cdef class Program(object):
164 def state2_set(self, state): 164 def state2_set(self, state):
165 if isinstance(state, unicode): state = state.encode("UTF-8") 165 if isinstance(state, unicode): state = state.encode("UTF-8")
166 return bool(edje_edit_program_state2_set(self.edje.obj, self.name, 166 return bool(edje_edit_program_state2_set(self.edje.obj, self.name,
167 <const_char *>state if state is not None else NULL)) 167 <const char *>state if state is not None else NULL))
168 168
169 def value2_get(self): 169 def value2_get(self):
170 return edje_edit_program_value2_get(self.edje.obj, self.name) 170 return edje_edit_program_value2_get(self.edje.obj, self.name)
@@ -187,8 +187,8 @@ cdef class Program(object):
187 property api: 187 property api:
188 def __get__(self): 188 def __get__(self):
189 cdef: 189 cdef:
190 const_char *name 190 const char *name
191 const_char *desc 191 const char *desc
192 name = edje_edit_program_api_name_get(self.edje.obj, self.name) 192 name = edje_edit_program_api_name_get(self.edje.obj, self.name)
193 desc = edje_edit_program_api_description_get(self.edje.obj, self.name) 193 desc = edje_edit_program_api_description_get(self.edje.obj, self.name)
194 n, d = _ctouni(name), _ctouni(desc) 194 n, d = _ctouni(name), _ctouni(desc)
@@ -202,9 +202,9 @@ cdef class Program(object):
202 if isinstance(name, unicode): name = name.encode("UTF-8") 202 if isinstance(name, unicode): name = name.encode("UTF-8")
203 if isinstance(desc, unicode): desc = desc.encode("UTF-8") 203 if isinstance(desc, unicode): desc = desc.encode("UTF-8")
204 edje_edit_program_api_name_set(self.edje.obj, self.name, 204 edje_edit_program_api_name_set(self.edje.obj, self.name,
205 <const_char *>name if name is not None else NULL) 205 <const char *>name if name is not None else NULL)
206 edje_edit_program_api_description_set(self.edje.obj, self.name, 206 edje_edit_program_api_description_set(self.edje.obj, self.name,
207 <const_char *>desc if desc is not None else NULL) 207 <const char *>desc if desc is not None else NULL)
208 208
209 property script: 209 property script:
210 def __get__(self): 210 def __get__(self):
@@ -217,7 +217,7 @@ cdef class Program(object):
217 def __set__(self, code): 217 def __set__(self, code):
218 if isinstance(code, unicode): code = code.encode("UTF-8") 218 if isinstance(code, unicode): code = code.encode("UTF-8")
219 edje_edit_script_program_set(self.edje.obj, self.name, 219 edje_edit_script_program_set(self.edje.obj, self.name,
220 <const_char *>code if code is not None else NULL) 220 <const char *>code if code is not None else NULL)
221 221
222 def __del__(self): 222 def __del__(self):
223 edje_edit_script_program_set(self.edje.obj, self.name, NULL) 223 edje_edit_script_program_set(self.edje.obj, self.name, NULL)
diff --git a/efl/edje/efl.edje_external.pxi b/efl/edje/efl.edje_external.pxi
index e73886e..316bf06 100644
--- a/efl/edje/efl.edje_external.pxi
+++ b/efl/edje/efl.edje_external.pxi
@@ -91,7 +91,7 @@ cdef class ExternalParamInfo:
91 91
92 property translated_name: 92 property translated_name:
93 def __get__(self): 93 def __get__(self):
94 cdef const_char *t 94 cdef const char *t
95 if self._external_type_obj == NULL or \ 95 if self._external_type_obj == NULL or \
96 self._external_type_obj.translate == NULL: 96 self._external_type_obj.translate == NULL:
97 return self.name 97 return self.name
@@ -195,7 +195,7 @@ cdef class ExternalParamInfoString(ExternalParamInfo):
195 195
196 property translated_default: 196 property translated_default:
197 def __get__(self): 197 def __get__(self):
198 cdef const_char *t 198 cdef const char *t
199 if self._external_type_obj == NULL or \ 199 if self._external_type_obj == NULL or \
200 self._external_type_obj.translate == NULL: 200 self._external_type_obj.translate == NULL:
201 return self.default 201 return self.default
@@ -231,7 +231,7 @@ cdef class ExternalParamInfoBool(ExternalParamInfo):
231 231
232 property translated_false_string: 232 property translated_false_string:
233 def __get__(self): 233 def __get__(self):
234 cdef const_char *t 234 cdef const char *t
235 if self._external_type_obj == NULL or \ 235 if self._external_type_obj == NULL or \
236 self._external_type_obj.translate == NULL: 236 self._external_type_obj.translate == NULL:
237 return self.false_string 237 return self.false_string
@@ -249,7 +249,7 @@ cdef class ExternalParamInfoBool(ExternalParamInfo):
249 249
250 property translated_true_string: 250 property translated_true_string:
251 def __get__(self): 251 def __get__(self):
252 cdef const_char *t 252 cdef const char *t
253 if self._external_type_obj == NULL or \ 253 if self._external_type_obj == NULL or \
254 self._external_type_obj.translate == NULL: 254 self._external_type_obj.translate == NULL:
255 return self.true_string 255 return self.true_string
@@ -269,7 +269,7 @@ cdef class ExternalParamInfoChoice(ExternalParamInfo):
269 269
270 property translated_default: 270 property translated_default:
271 def __get__(self): 271 def __get__(self):
272 cdef const_char *t 272 cdef const char *t
273 if self._external_type_obj == NULL or \ 273 if self._external_type_obj == NULL or \
274 self._external_type_obj.translate == NULL: 274 self._external_type_obj.translate == NULL:
275 return self.default 275 return self.default
@@ -295,7 +295,7 @@ cdef class ExternalParamInfoChoice(ExternalParamInfo):
295 295
296 property translated_choices: 296 property translated_choices:
297 def __get__(self): 297 def __get__(self):
298 cdef const_char *t 298 cdef const char *t
299 if self._external_type_obj == NULL or \ 299 if self._external_type_obj == NULL or \
300 self._external_type_obj.translate == NULL: 300 self._external_type_obj.translate == NULL:
301 return self.choices 301 return self.choices
@@ -331,7 +331,7 @@ cdef ExternalParamInfo ExternalParamInfo_from_ptr(type, Edje_External_Param_Info
331 return p 331 return p
332 332
333def external_param_info_get(char *type_name): 333def external_param_info_get(char *type_name):
334 cdef const_Edje_External_Type *ext_type 334 cdef const Edje_External_Type *ext_type
335 cdef ExternalType t 335 cdef ExternalType t
336 336
337 warnings.warn("Use ExternalType.parameters_info_get() instead!", 337 warnings.warn("Use ExternalType.parameters_info_get() instead!",
@@ -365,7 +365,7 @@ cdef class ExternalType:
365 return self._obj.module_name 365 return self._obj.module_name
366 366
367 def label_get(self): 367 def label_get(self):
368 cdef const_char *l 368 cdef const char *l
369 if self._obj.label_get == NULL: 369 if self._obj.label_get == NULL:
370 return None 370 return None
371 l = self._obj.label_get(self._obj.data) 371 l = self._obj.label_get(self._obj.data)
@@ -375,7 +375,7 @@ cdef class ExternalType:
375 return ret 375 return ret
376 376
377 def description_get(self): 377 def description_get(self):
378 cdef const_char *l 378 cdef const char *l
379 if self._obj.description_get == NULL: 379 if self._obj.description_get == NULL:
380 return None 380 return None
381 l = self._obj.description_get(self._obj.data) 381 l = self._obj.description_get(self._obj.data)
@@ -395,7 +395,7 @@ cdef class ExternalType:
395 It will always return a string, on errors the parameter text 395 It will always return a string, on errors the parameter text
396 is returned untranslated. 396 is returned untranslated.
397 """ 397 """
398 cdef const_char *l 398 cdef const char *l
399 if self._obj.translate == NULL: 399 if self._obj.translate == NULL:
400 return text 400 return text
401 l = self._obj.translate(self._obj.data, text) 401 l = self._obj.translate(self._obj.data, text)
@@ -460,12 +460,12 @@ cdef class ExternalIterator:
460 return self 460 return self
461 461
462 def __next__(self): 462 def __next__(self):
463 cdef const_Eina_Hash_Tuple *tuple 463 cdef const Eina_Hash_Tuple *tuple
464 cdef ExternalType t 464 cdef ExternalType t
465 if eina_iterator_next(self.obj, <void **>&tuple): 465 if eina_iterator_next(self.obj, <void **>&tuple):
466 t = ExternalType() 466 t = ExternalType()
467 t._name = <char*>tuple.key 467 t._name = <char*>tuple.key
468 t._obj = <const_Edje_External_Type*>tuple.data 468 t._obj = <const Edje_External_Type*>tuple.data
469 return t 469 return t
470 else: 470 else:
471 raise StopIteration 471 raise StopIteration
@@ -476,7 +476,7 @@ cdef class ExternalIterator:
476 476
477def external_type_get(char *type_name): 477def external_type_get(char *type_name):
478 "Gets the instance that represents an ExternalType of the given name." 478 "Gets the instance that represents an ExternalType of the given name."
479 cdef const_Edje_External_Type *obj = edje_external_type_get(type_name) 479 cdef const Edje_External_Type *obj = edje_external_type_get(type_name)
480 cdef ExternalType ret 480 cdef ExternalType ret
481 if obj == NULL: 481 if obj == NULL:
482 return None 482 return None
diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi
index 6e412d7..5b04016 100644
--- a/efl/edje/efl.edje_object.pxi
+++ b/efl/edje/efl.edje_object.pxi
@@ -19,7 +19,7 @@ from efl.evas cimport Object
19 19
20cdef void text_change_cb(void *data, 20cdef void text_change_cb(void *data,
21 Evas_Object *obj, 21 Evas_Object *obj,
22 const_char *part) with gil: 22 const char *part) with gil:
23 cdef Edje self 23 cdef Edje self
24 self = <Edje>data 24 self = <Edje>data
25 if self._text_change_cb is None: 25 if self._text_change_cb is None:
@@ -47,7 +47,7 @@ cdef void message_handler_cb(void *data,
47 47
48 48
49cdef void signal_cb(void *data, Evas_Object *obj, 49cdef void signal_cb(void *data, Evas_Object *obj,
50 const_char *emission, const_char *source) with gil: 50 const char *emission, const char *source) with gil:
51 cdef Edje self 51 cdef Edje self
52 self = object_from_instance(obj) 52 self = object_from_instance(obj)
53 lst = tuple(<object>data) 53 lst = tuple(<object>data)
@@ -188,7 +188,7 @@ cdef class Edje(Object):
188 """ 188 """
189 if isinstance(key, unicode): key = PyUnicode_AsUTF8String(key) 189 if isinstance(key, unicode): key = PyUnicode_AsUTF8String(key)
190 return _ctouni(edje_object_data_get(self.obj, 190 return _ctouni(edje_object_data_get(self.obj,
191 <const_char *>key if key is not None else NULL)) 191 <const char *>key if key is not None else NULL))
192 192
193 def file_set(self, file, group): 193 def file_set(self, file, group):
194 """Set the file (.edj) and the group to load the Edje object from. 194 """Set the file (.edj) and the group to load the Edje object from.
@@ -202,8 +202,8 @@ cdef class Edje(Object):
202 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file) 202 if isinstance(file, unicode): file = PyUnicode_AsUTF8String(file)
203 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group) 203 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group)
204 if edje_object_file_set(self.obj, 204 if edje_object_file_set(self.obj,
205 <const_char *>file if file is not None else NULL, 205 <const char *>file if file is not None else NULL,
206 <const_char *>group if group is not None else NULL) == 0: 206 <const char *>group if group is not None else NULL) == 0:
207 raise EdjeLoadError(edje_object_load_error_get(self.obj), file, group) 207 raise EdjeLoadError(edje_object_load_error_get(self.obj), file, group)
208 208
209 def file_get(self): 209 def file_get(self):
@@ -214,8 +214,8 @@ cdef class Edje(Object):
214 214
215 """ 215 """
216 cdef: 216 cdef:
217 const_char *file 217 const char *file
218 const_char *group 218 const char *group
219 edje_object_file_get(self.obj, &file, &group) 219 edje_object_file_get(self.obj, &file, &group)
220 return (_ctouni(file), _ctouni(group)) 220 return (_ctouni(file), _ctouni(group))
221 221
@@ -313,7 +313,7 @@ cdef class Edje(Object):
313 if isinstance(color_class, unicode): 313 if isinstance(color_class, unicode):
314 color_class = PyUnicode_AsUTF8String(color_class) 314 color_class = PyUnicode_AsUTF8String(color_class)
315 edje_object_color_class_set(self.obj, 315 edje_object_color_class_set(self.obj,
316 <const_char *>color_class if color_class is not None else NULL, 316 <const char *>color_class if color_class is not None else NULL,
317 r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3) 317 r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3)
318 318
319 def color_class_get(self, color_class): 319 def color_class_get(self, color_class):
@@ -330,7 +330,7 @@ cdef class Edje(Object):
330 if isinstance(color_class, unicode): 330 if isinstance(color_class, unicode):
331 color_class = PyUnicode_AsUTF8String(color_class) 331 color_class = PyUnicode_AsUTF8String(color_class)
332 edje_object_color_class_get(self.obj, 332 edje_object_color_class_get(self.obj,
333 <const_char *>color_class if color_class is not None else NULL, 333 <const char *>color_class if color_class is not None else NULL,
334 &r, &g, &b, &a, &r2, &g2, &b2, &a2, &r3, &g3, &b3, &a3) 334 &r, &g, &b, &a, &r2, &g2, &b2, &a2, &r3, &g3, &b3, &a3)
335 return (r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3) 335 return (r, g, b, a, r2, g2, b2, a2, r3, g3, b3, a3)
336 336
@@ -339,7 +339,7 @@ cdef class Edje(Object):
339 if isinstance(color_class, unicode): 339 if isinstance(color_class, unicode):
340 color_class = PyUnicode_AsUTF8String(color_class) 340 color_class = PyUnicode_AsUTF8String(color_class)
341 edje_object_color_class_del(self.obj, 341 edje_object_color_class_del(self.obj,
342 <const_char *>color_class if color_class is not None else NULL) 342 <const char *>color_class if color_class is not None else NULL)
343 343
344 def text_class_set(self, text_class, font, int size): 344 def text_class_set(self, text_class, font, int size):
345 """Set text class. 345 """Set text class.
@@ -353,8 +353,8 @@ cdef class Edje(Object):
353 if isinstance(font, unicode): 353 if isinstance(font, unicode):
354 font = PyUnicode_AsUTF8String(font) 354 font = PyUnicode_AsUTF8String(font)
355 edje_object_text_class_set(self.obj, 355 edje_object_text_class_set(self.obj,
356 <const_char *>text_class if text_class is not None else NULL, 356 <const char *>text_class if text_class is not None else NULL,
357 <const_char *>font if font is not None else NULL, 357 <const char *>font if font is not None else NULL,
358 size) 358 size)
359 359
360 property scale: 360 property scale:
@@ -492,7 +492,7 @@ cdef class Edje(Object):
492 ":rtype: bool" 492 ":rtype: bool"
493 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 493 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
494 return bool(edje_object_part_exists(self.obj, 494 return bool(edje_object_part_exists(self.obj,
495 <const_char *>part if part is not None else NULL)) 495 <const char *>part if part is not None else NULL))
496 496
497 def part_object_get(self, part): 497 def part_object_get(self, part):
498 """ 498 """
@@ -508,7 +508,7 @@ cdef class Edje(Object):
508 cdef Evas_Object *obj 508 cdef Evas_Object *obj
509 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 509 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
510 obj = <Evas_Object*>edje_object_part_object_get(self.obj, 510 obj = <Evas_Object*>edje_object_part_object_get(self.obj,
511 <const_char *>part if part is not None else NULL) 511 <const char *>part if part is not None else NULL)
512 return object_from_instance(obj) 512 return object_from_instance(obj)
513 513
514 def part_geometry_get(self, part): 514 def part_geometry_get(self, part):
@@ -516,7 +516,7 @@ cdef class Edje(Object):
516 cdef int x, y, w, h 516 cdef int x, y, w, h
517 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 517 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
518 edje_object_part_geometry_get(self.obj, 518 edje_object_part_geometry_get(self.obj,
519 <const_char *>part if part is not None else NULL, 519 <const char *>part if part is not None else NULL,
520 &x, &y, &w, &h) 520 &x, &y, &w, &h)
521 return (x, y, w, h) 521 return (x, y, w, h)
522 522
@@ -525,7 +525,7 @@ cdef class Edje(Object):
525 cdef int w, h 525 cdef int w, h
526 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 526 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
527 edje_object_part_geometry_get(self.obj, 527 edje_object_part_geometry_get(self.obj,
528 <const_char *>part if part is not None else NULL, 528 <const char *>part if part is not None else NULL,
529 NULL, NULL, &w, &h) 529 NULL, NULL, &w, &h)
530 return (w, h) 530 return (w, h)
531 531
@@ -534,7 +534,7 @@ cdef class Edje(Object):
534 cdef int x, y 534 cdef int x, y
535 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 535 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
536 edje_object_part_geometry_get(self.obj, 536 edje_object_part_geometry_get(self.obj,
537 <const_char *>part if part is not None else NULL, 537 <const char *>part if part is not None else NULL,
538 &x, &y, NULL, NULL) 538 &x, &y, NULL, NULL)
539 return (x, y) 539 return (x, y)
540 540
@@ -567,8 +567,8 @@ cdef class Edje(Object):
567 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 567 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
568 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text) 568 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text)
569 edje_object_part_text_set(self.obj, 569 edje_object_part_text_set(self.obj,
570 <const_char *>part if part is not None else NULL, 570 <const char *>part if part is not None else NULL,
571 <const_char *>text if text is not None else NULL) 571 <const char *>text if text is not None else NULL)
572 572
573 def part_text_get(self, part): 573 def part_text_get(self, part):
574 """Get the text of a given part. 574 """Get the text of a given part.
@@ -577,22 +577,22 @@ cdef class Edje(Object):
577 :rtype: str 577 :rtype: str
578 578
579 """ 579 """
580 cdef const_char *s 580 cdef const char *s
581 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 581 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
582 return _ctouni(edje_object_part_text_get(self.obj, 582 return _ctouni(edje_object_part_text_get(self.obj,
583 <const_char *>part if part is not None else NULL)) 583 <const char *>part if part is not None else NULL))
584 584
585 def part_text_select_all(self, part): 585 def part_text_select_all(self, part):
586 "Select all the text of the given TEXT or TEXTBLOCK part" 586 "Select all the text of the given TEXT or TEXTBLOCK part"
587 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 587 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
588 edje_object_part_text_select_all(self.obj, 588 edje_object_part_text_select_all(self.obj,
589 <const_char *>part if part is not None else NULL) 589 <const char *>part if part is not None else NULL)
590 590
591 def part_text_select_none(self, part): 591 def part_text_select_none(self, part):
592 "Deselect all the text of the given TEXT or TEXTBLOCK part" 592 "Deselect all the text of the given TEXT or TEXTBLOCK part"
593 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 593 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
594 edje_object_part_text_select_none(self.obj, 594 edje_object_part_text_select_none(self.obj,
595 <const_char *>part if part is not None else NULL) 595 <const char *>part if part is not None else NULL)
596 596
597 def part_text_unescaped_set(self, part, text_to_escape): 597 def part_text_unescaped_set(self, part, text_to_escape):
598 """Automatically escapes text if using TEXTBLOCK. 598 """Automatically escapes text if using TEXTBLOCK.
@@ -608,8 +608,8 @@ cdef class Edje(Object):
608 if isinstance(text_to_escape, unicode): 608 if isinstance(text_to_escape, unicode):
609 text_to_escape = PyUnicode_AsUTF8String(text_to_escape) 609 text_to_escape = PyUnicode_AsUTF8String(text_to_escape)
610 edje_object_part_text_unescaped_set(self.obj, 610 edje_object_part_text_unescaped_set(self.obj,
611 <const_char *>part if part is not None else NULL, 611 <const char *>part if part is not None else NULL,
612 <const_char *>text_to_escape if text_to_escape is not None else NULL) 612 <const char *>text_to_escape if text_to_escape is not None else NULL)
613 613
614 def part_text_unescaped_get(self, part): 614 def part_text_unescaped_get(self, part):
615 """Automatically removes escape from text if using TEXTBLOCK. 615 """Automatically removes escape from text if using TEXTBLOCK.
@@ -623,7 +623,7 @@ cdef class Edje(Object):
623 cdef char *s 623 cdef char *s
624 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 624 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
625 s = edje_object_part_text_unescaped_get(self.obj, 625 s = edje_object_part_text_unescaped_get(self.obj,
626 <const_char *>part if part is not None else NULL) 626 <const char *>part if part is not None else NULL)
627 if s == NULL: 627 if s == NULL:
628 return None 628 return None
629 else: 629 else:
@@ -649,7 +649,7 @@ cdef class Edje(Object):
649 """ 649 """
650 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 650 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
651 edje_object_part_swallow(self.obj, 651 edje_object_part_swallow(self.obj,
652 <const_char *>part if part is not None else NULL, obj.obj) 652 <const char *>part if part is not None else NULL, obj.obj)
653 653
654 def part_unswallow(self, Object obj): 654 def part_unswallow(self, Object obj):
655 "Unswallow the given object from the edje" 655 "Unswallow the given object from the edje"
@@ -659,13 +659,13 @@ cdef class Edje(Object):
659 ":rtype: efl.evas.Object" 659 ":rtype: efl.evas.Object"
660 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 660 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
661 return object_from_instance(edje_object_part_swallow_get( 661 return object_from_instance(edje_object_part_swallow_get(
662 self.obj, <const_char *>part if part is not None else NULL)) 662 self.obj, <const char *>part if part is not None else NULL))
663 663
664 def part_external_object_get(self, part): 664 def part_external_object_get(self, part):
665 ":rtype: efl.evas.Object" 665 ":rtype: efl.evas.Object"
666 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 666 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
667 return object_from_instance(edje_object_part_external_object_get( 667 return object_from_instance(edje_object_part_external_object_get(
668 self.obj, <const_char *>part if part is not None else NULL)) 668 self.obj, <const char *>part if part is not None else NULL))
669 669
670 def part_external_param_set(self, part, param, value): 670 def part_external_param_set(self, part, param, value):
671 """Set a parameter of the external part. 671 """Set a parameter of the external part.
@@ -677,8 +677,8 @@ cdef class Edje(Object):
677 :rtype: bool 677 :rtype: bool
678 """ 678 """
679 cdef Edje_External_Param p 679 cdef Edje_External_Param p
680 cdef const_char *c_part 680 cdef const char *c_part
681 cdef const_char *c_param 681 cdef const char *c_param
682 682
683 if isinstance(part, unicode): 683 if isinstance(part, unicode):
684 str1 = PyUnicode_AsUTF8String(part) 684 str1 = PyUnicode_AsUTF8String(part)
@@ -729,8 +729,8 @@ cdef class Edje(Object):
729 :return: *None* for errors, other values depending on the parameter type. 729 :return: *None* for errors, other values depending on the parameter type.
730 """ 730 """
731 cdef Edje_External_Param p 731 cdef Edje_External_Param p
732 cdef const_char *c_part 732 cdef const char *c_part
733 cdef const_char *c_param 733 cdef const char *c_param
734 734
735 if isinstance(part, unicode): 735 if isinstance(part, unicode):
736 str1 = PyUnicode_AsUTF8String(part) 736 str1 = PyUnicode_AsUTF8String(part)
@@ -780,7 +780,7 @@ cdef class Edje(Object):
780 """ 780 """
781 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 781 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
782 return bool(edje_object_part_box_append(self.obj, 782 return bool(edje_object_part_box_append(self.obj,
783 <const_char *>part if part is not None else NULL, obj.obj)) 783 <const char *>part if part is not None else NULL, obj.obj))
784 784
785 def part_box_prepend(self, part, Object obj): 785 def part_box_prepend(self, part, Object obj):
786 """Prepend an item to a BOX part. 786 """Prepend an item to a BOX part.
@@ -795,7 +795,7 @@ cdef class Edje(Object):
795 """ 795 """
796 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 796 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
797 return bool(edje_object_part_box_prepend(self.obj, 797 return bool(edje_object_part_box_prepend(self.obj,
798 <const_char *>part if part is not None else NULL, obj.obj)) 798 <const char *>part if part is not None else NULL, obj.obj))
799 799
800 def part_box_insert_at(self, part, Object obj, 800 def part_box_insert_at(self, part, Object obj,
801 unsigned int pos): 801 unsigned int pos):
@@ -808,7 +808,7 @@ cdef class Edje(Object):
808 """ 808 """
809 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 809 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
810 return bool(edje_object_part_box_insert_at(self.obj, 810 return bool(edje_object_part_box_insert_at(self.obj,
811 <const_char *>part if part is not None else NULL, obj.obj, pos)) 811 <const char *>part if part is not None else NULL, obj.obj, pos))
812 812
813 def part_box_insert_before(self, part, Object obj, Object reference): 813 def part_box_insert_before(self, part, Object obj, Object reference):
814 """Inserts an item in a BOX part before the reference object. 814 """Inserts an item in a BOX part before the reference object.
@@ -820,7 +820,7 @@ cdef class Edje(Object):
820 """ 820 """
821 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 821 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
822 return bool(edje_object_part_box_insert_before(self.obj, 822 return bool(edje_object_part_box_insert_before(self.obj,
823 <const_char *>part if part is not None else NULL, 823 <const char *>part if part is not None else NULL,
824 obj.obj, reference.obj)) 824 obj.obj, reference.obj))
825 825
826 def part_box_remove(self, part, Object obj): 826 def part_box_remove(self, part, Object obj):
@@ -837,7 +837,7 @@ cdef class Edje(Object):
837 """ 837 """
838 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 838 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
839 return object_from_instance(edje_object_part_box_remove(self.obj, 839 return object_from_instance(edje_object_part_box_remove(self.obj,
840 <const_char *>part if part is not None else NULL, obj.obj)) 840 <const char *>part if part is not None else NULL, obj.obj))
841 841
842 def part_box_remove_at(self, part, unsigned int pos): 842 def part_box_remove_at(self, part, unsigned int pos):
843 """Removes the object at the given position in a BOX part. 843 """Removes the object at the given position in a BOX part.
@@ -852,7 +852,7 @@ cdef class Edje(Object):
852 """ 852 """
853 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 853 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
854 return object_from_instance(edje_object_part_box_remove_at(self.obj, 854 return object_from_instance(edje_object_part_box_remove_at(self.obj,
855 <const_char *>part if part is not None else NULL, pos)) 855 <const char *>part if part is not None else NULL, pos))
856 856
857 def part_box_remove_all(self, part, int clear): 857 def part_box_remove_all(self, part, int clear):
858 """Removes all objects from a BOX part. 858 """Removes all objects from a BOX part.
@@ -866,7 +866,7 @@ cdef class Edje(Object):
866 """ 866 """
867 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 867 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
868 return bool(edje_object_part_box_remove_all(self.obj, 868 return bool(edje_object_part_box_remove_all(self.obj,
869 <const_char *>part if part is not None else NULL, clear)) 869 <const char *>part if part is not None else NULL, clear))
870 870
871 def part_table_pack(self, part, Object child, short col, short row, short colspan, short rowspan): 871 def part_table_pack(self, part, Object child, short col, short row, short colspan, short rowspan):
872 """Pack an object inside a TABLE part. 872 """Pack an object inside a TABLE part.
@@ -882,7 +882,7 @@ cdef class Edje(Object):
882 """ 882 """
883 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 883 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
884 return bool(edje_object_part_table_pack(self.obj, 884 return bool(edje_object_part_table_pack(self.obj,
885 <const_char *>part if part is not None else NULL, 885 <const char *>part if part is not None else NULL,
886 child.obj, col, row, colspan, rowspan)) 886 child.obj, col, row, colspan, rowspan))
887 887
888 def part_table_unpack(self, part, Object child): 888 def part_table_unpack(self, part, Object child):
@@ -895,7 +895,7 @@ cdef class Edje(Object):
895 """ 895 """
896 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 896 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
897 return bool(edje_object_part_table_unpack(self.obj, 897 return bool(edje_object_part_table_unpack(self.obj,
898 <const_char *>part if part is not None else NULL, 898 <const char *>part if part is not None else NULL,
899 child.obj)) 899 child.obj))
900 900
901 def part_table_col_row_size_get(self, part): 901 def part_table_col_row_size_get(self, part):
@@ -908,7 +908,7 @@ cdef class Edje(Object):
908 cdef int c, r 908 cdef int c, r
909 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 909 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
910 edje_object_part_table_col_row_size_get(self.obj, 910 edje_object_part_table_col_row_size_get(self.obj,
911 <const_char *>part if part is not None else NULL, &c, &r) 911 <const char *>part if part is not None else NULL, &c, &r)
912 return (c, r) 912 return (c, r)
913 913
914 def part_table_clear(self, part, int clear): 914 def part_table_clear(self, part, int clear):
@@ -923,7 +923,7 @@ cdef class Edje(Object):
923 """ 923 """
924 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 924 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
925 return bool(edje_object_part_table_clear(self.obj, 925 return bool(edje_object_part_table_clear(self.obj,
926 <const_char *>part if part is not None else NULL, clear)) 926 <const char *>part if part is not None else NULL, clear))
927 927
928 def part_table_child_get(self, part, int row, int column): 928 def part_table_child_get(self, part, int row, int column):
929 """Retrieve a child from a table. 929 """Retrieve a child from a table.
@@ -937,22 +937,22 @@ cdef class Edje(Object):
937 """ 937 """
938 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 938 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
939 return object_from_instance(edje_object_part_table_child_get(self.obj, 939 return object_from_instance(edje_object_part_table_child_get(self.obj,
940 <const_char *>part if part is not None else NULL, row, column)) 940 <const char *>part if part is not None else NULL, row, column))
941 941
942 def part_state_get(self, part): 942 def part_state_get(self, part):
943 ":rtype: (name, value)" 943 ":rtype: (name, value)"
944 cdef double sv 944 cdef double sv
945 cdef const_char *sn 945 cdef const char *sn
946 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 946 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
947 sn = edje_object_part_state_get(self.obj, 947 sn = edje_object_part_state_get(self.obj,
948 <const_char *>part if part is not None else NULL, &sv) 948 <const char *>part if part is not None else NULL, &sv)
949 return (_ctouni(sn), sv) 949 return (_ctouni(sn), sv)
950 950
951 def part_drag_dir_get(self, part): 951 def part_drag_dir_get(self, part):
952 ":rtype: int" 952 ":rtype: int"
953 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 953 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
954 return edje_object_part_drag_dir_get(self.obj, 954 return edje_object_part_drag_dir_get(self.obj,
955 <const_char *>part if part is not None else NULL) 955 <const char *>part if part is not None else NULL)
956 956
957 def part_drag_value_set(self, part, double dx, double dy): 957 def part_drag_value_set(self, part, double dx, double dy):
958 """Set the drag value of part 958 """Set the drag value of part
@@ -961,14 +961,14 @@ cdef class Edje(Object):
961 """ 961 """
962 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 962 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
963 edje_object_part_drag_value_set(self.obj, 963 edje_object_part_drag_value_set(self.obj,
964 <const_char *>part if part is not None else NULL, dx, dy) 964 <const char *>part if part is not None else NULL, dx, dy)
965 965
966 def part_drag_value_get(self, part): 966 def part_drag_value_get(self, part):
967 ":rtype: tuple of float" 967 ":rtype: tuple of float"
968 cdef double dx, dy 968 cdef double dx, dy
969 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 969 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
970 edje_object_part_drag_value_get(self.obj, 970 edje_object_part_drag_value_get(self.obj,
971 <const_char *>part if part is not None else NULL, &dx, &dy) 971 <const char *>part if part is not None else NULL, &dx, &dy)
972 return (dx, dy) 972 return (dx, dy)
973 973
974 def part_drag_size_set(self, part, double dw, double dh): 974 def part_drag_size_set(self, part, double dw, double dh):
@@ -978,14 +978,14 @@ cdef class Edje(Object):
978 """ 978 """
979 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 979 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
980 edje_object_part_drag_size_set(self.obj, 980 edje_object_part_drag_size_set(self.obj,
981 <const_char *>part if part is not None else NULL, dw, dh) 981 <const char *>part if part is not None else NULL, dw, dh)
982 982
983 def part_drag_size_get(self, part): 983 def part_drag_size_get(self, part):
984 ":rtype: tuple of float" 984 ":rtype: tuple of float"
985 cdef double dw, dh 985 cdef double dw, dh
986 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 986 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
987 edje_object_part_drag_size_get(self.obj, 987 edje_object_part_drag_size_get(self.obj,
988 <const_char *>part if part is not None else NULL, &dw, &dh) 988 <const char *>part if part is not None else NULL, &dw, &dh)
989 return (dw, dh) 989 return (dw, dh)
990 990
991 def part_drag_step_set(self, part, double dx, double dy): 991 def part_drag_step_set(self, part, double dx, double dy):
@@ -995,38 +995,38 @@ cdef class Edje(Object):
995 """ 995 """
996 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 996 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
997 edje_object_part_drag_step_set(self.obj, 997 edje_object_part_drag_step_set(self.obj,
998 <const_char *>part if part is not None else NULL, dx, dy) 998 <const char *>part if part is not None else NULL, dx, dy)
999 999
1000 def part_drag_step_get(self, part): 1000 def part_drag_step_get(self, part):
1001 ":rtype: tuple of float" 1001 ":rtype: tuple of float"
1002 cdef double dx, dy 1002 cdef double dx, dy
1003 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 1003 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
1004 edje_object_part_drag_step_get(self.obj, 1004 edje_object_part_drag_step_get(self.obj,
1005 <const_char *>part if part is not None else NULL, &dx, &dy) 1005 <const char *>part if part is not None else NULL, &dx, &dy)
1006 return (dx, dy) 1006 return (dx, dy)
1007 1007
1008 def part_drag_step(self, part, double dx, double dy): 1008 def part_drag_step(self, part, double dx, double dy):
1009 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 1009 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
1010 edje_object_part_drag_step(self.obj, 1010 edje_object_part_drag_step(self.obj,
1011 <const_char *>part if part is not None else NULL, dx, dy) 1011 <const char *>part if part is not None else NULL, dx, dy)
1012 1012
1013 def part_drag_page_set(self, part, double dx, double dy): 1013 def part_drag_page_set(self, part, double dx, double dy):
1014 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 1014 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
1015 edje_object_part_drag_page_set(self.obj, 1015 edje_object_part_drag_page_set(self.obj,
1016 <const_char *>part if part is not None else NULL, dx, dy) 1016 <const char *>part if part is not None else NULL, dx, dy)
1017 1017
1018 def part_drag_page_get(self, part): 1018 def part_drag_page_get(self, part):
1019 ":rtype: tuple of float" 1019 ":rtype: tuple of float"
1020 cdef double dx, dy 1020 cdef double dx, dy
1021 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 1021 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
1022 edje_object_part_drag_page_get(self.obj, 1022 edje_object_part_drag_page_get(self.obj,
1023 <const_char *>part if part is not None else NULL, &dx, &dy) 1023 <const char *>part if part is not None else NULL, &dx, &dy)
1024 return (dx, dy) 1024 return (dx, dy)
1025 1025
1026 def part_drag_page(self, part, double dx, double dy): 1026 def part_drag_page(self, part, double dx, double dy):
1027 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) 1027 if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part)
1028 edje_object_part_drag_page(self.obj, 1028 edje_object_part_drag_page(self.obj,
1029 <const_char *>part if part is not None else NULL, dx, dy) 1029 <const char *>part if part is not None else NULL, dx, dy)
1030 1030
1031 cdef void message_send_int(self, int id, int data): 1031 cdef void message_send_int(self, int id, int data):
1032 cdef Edje_Message_Int m 1032 cdef Edje_Message_Int m
@@ -1270,8 +1270,8 @@ cdef class Edje(Object):
1270 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission) 1270 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission)
1271 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source) 1271 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source)
1272 edje_object_signal_callback_add(self.obj, 1272 edje_object_signal_callback_add(self.obj,
1273 <const_char *>emission if emission is not None else NULL, 1273 <const char *>emission if emission is not None else NULL,
1274 <const_char *>source if source is not None else NULL, 1274 <const char *>source if source is not None else NULL,
1275 signal_cb, <void*>lst) 1275 signal_cb, <void*>lst)
1276 lst.append((func, args, kargs)) 1276 lst.append((func, args, kargs))
1277 1277
@@ -1303,8 +1303,8 @@ cdef class Edje(Object):
1303 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission) 1303 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission)
1304 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source) 1304 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source)
1305 edje_object_signal_callback_del(self.obj, 1305 edje_object_signal_callback_del(self.obj,
1306 <const_char *>emission if emission is not None else NULL, 1306 <const char *>emission if emission is not None else NULL,
1307 <const_char *>source if source is not None else NULL, 1307 <const char *>source if source is not None else NULL,
1308 signal_cb) 1308 signal_cb)
1309 1309
1310 def signal_emit(self, emission, source): 1310 def signal_emit(self, emission, source):
@@ -1312,8 +1312,8 @@ cdef class Edje(Object):
1312 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission) 1312 if isinstance(emission, unicode): emission = PyUnicode_AsUTF8String(emission)
1313 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source) 1313 if isinstance(source, unicode): source = PyUnicode_AsUTF8String(source)
1314 edje_object_signal_emit(self.obj, 1314 edje_object_signal_emit(self.obj,
1315 <const_char *>emission if emission is not None else NULL, 1315 <const char *>emission if emission is not None else NULL,
1316 <const_char *>source if source is not None else NULL) 1316 <const char *>source if source is not None else NULL)
1317 1317
1318 1318
1319# decorators 1319# decorators
diff --git a/efl/elementary/access.pxd b/efl/elementary/access.pxd
index 6054019..2e825ca 100644
--- a/efl/elementary/access.pxd
+++ b/efl/elementary/access.pxd
@@ -1,7 +1,4 @@
1from libc.string cimport const_char 1from efl.evas cimport Evas_Object
2from libc.stdlib cimport const_void
3
4from efl.evas cimport Evas_Object, const_Evas_Object
5from object_item cimport Elm_Object_Item 2from object_item cimport Elm_Object_Item
6 3
7cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
@@ -9,9 +6,9 @@ cdef extern from "Elementary.h":
9 ctypedef void (*Elm_Access_Activate_Cb)(void *data, Evas_Object *part_obj, Elm_Object_Item *item) 6 ctypedef void (*Elm_Access_Activate_Cb)(void *data, Evas_Object *part_obj, Elm_Object_Item *item)
10 7
11 Evas_Object * elm_access_object_register(Evas_Object *obj, Evas_Object *parent) 8 Evas_Object * elm_access_object_register(Evas_Object *obj, Evas_Object *parent)
12 void elm_access_info_set(Evas_Object *obj, int type, const_char *text) 9 void elm_access_info_set(Evas_Object *obj, int type, const char *text)
13 char * elm_access_info_get(const_Evas_Object *obj, int type) 10 char * elm_access_info_get(const Evas_Object *obj, int type)
14 # TODO: void elm_access_info_cb_set(Evas_Object *obj, int type, Elm_Access_Info_Cb func, const_void *data) 11 # TODO: void elm_access_info_cb_set(Evas_Object *obj, int type, Elm_Access_Info_Cb func, const void *data)
15 # TODO: void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb func, void *data) 12 # TODO: void elm_access_activate_cb_set(Evas_Object *obj, Elm_Access_Activate_Cb func, void *data)
16 void elm_access_highlight_set(Evas_Object* obj) 13 void elm_access_highlight_set(Evas_Object* obj)
17 14
diff --git a/efl/elementary/access.pyx b/efl/elementary/access.pyx
index c079679..1788360 100644
--- a/efl/elementary/access.pyx
+++ b/efl/elementary/access.pyx
@@ -79,7 +79,7 @@ cdef class Accessible(Object):
79 """ 79 """
80 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text) 80 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text)
81 elm_access_info_set(self.obj, type, 81 elm_access_info_set(self.obj, type,
82 <const_char *>text if text is not None else NULL) 82 <const char *>text if text is not None else NULL)
83 83
84 def info_get(self, int type): 84 def info_get(self, int type):
85 """Get text to give information for specific type. 85 """Get text to give information for specific type.
@@ -114,7 +114,7 @@ cdef class Accessible(Object):
114 # if not callable(func): 114 # if not callable(func):
115 # raise TypeError("func is not callable.") 115 # raise TypeError("func is not callable.")
116 116
117 # elm_access_info_cb_set(self.obj, type, access_info_cb, <const_void *>self) 117 # elm_access_info_cb_set(self.obj, type, access_info_cb, <const void *>self)
118 118
119 # def activate_cb_set(self, func, *args, **kwargs): 119 # def activate_cb_set(self, func, *args, **kwargs):
120 # """Set activate callback to activate highlight object. 120 # """Set activate callback to activate highlight object.
diff --git a/efl/elementary/actionslider.pyx b/efl/elementary/actionslider.pyx
index 58aa9d0..8f1b491 100644
--- a/efl/elementary/actionslider.pyx
+++ b/efl/elementary/actionslider.pyx
@@ -87,7 +87,6 @@ Actionslider positions
87""" 87"""
88 88
89from cpython cimport PyUnicode_AsUTF8String 89from cpython cimport PyUnicode_AsUTF8String
90from libc.string cimport const_char
91from libc.stdint cimport uintptr_t 90from libc.stdint cimport uintptr_t
92 91
93from efl.eo cimport _object_mapping_register 92from efl.eo cimport _object_mapping_register
@@ -104,7 +103,7 @@ ELM_ACTIONSLIDER_RIGHT = enums.ELM_ACTIONSLIDER_RIGHT
104ELM_ACTIONSLIDER_ALL = enums.ELM_ACTIONSLIDER_ALL 103ELM_ACTIONSLIDER_ALL = enums.ELM_ACTIONSLIDER_ALL
105 104
106def _cb_string_conv(uintptr_t addr): 105def _cb_string_conv(uintptr_t addr):
107 cdef const_char *s = <const_char *>addr 106 cdef const char *s = <const char *>addr
108 return _ctouni(s) if s is not NULL else None 107 return _ctouni(s) if s is not NULL else None
109 108
110cdef class Actionslider(LayoutClass): 109cdef class Actionslider(LayoutClass):
diff --git a/efl/elementary/background.pxd b/efl/elementary/background.pxd
index cb88787..f15232d 100644
--- a/efl/elementary/background.pxd
+++ b/efl/elementary/background.pxd
@@ -1,11 +1,10 @@
1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord
2from enums cimport Elm_Bg_Option 2from enums cimport Elm_Bg_Option
3from libc.string cimport const_char
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
6 Evas_Object *elm_bg_add(Evas_Object *parent) 5 Evas_Object *elm_bg_add(Evas_Object *parent)
7 Eina_Bool elm_bg_file_set(Evas_Object *obj, const_char *file, const_char *group) 6 Eina_Bool elm_bg_file_set(Evas_Object *obj, const char *file, const char *group)
8 void elm_bg_file_get(Evas_Object *obj, const_char **file, const_char **group) 7 void elm_bg_file_get(Evas_Object *obj, const char **file, const char **group)
9 void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) 8 void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option)
10 Elm_Bg_Option elm_bg_option_get(Evas_Object *obj) 9 Elm_Bg_Option elm_bg_option_get(Evas_Object *obj)
11 void elm_bg_color_set(Evas_Object *obj, int r, int g, int b) 10 void elm_bg_color_set(Evas_Object *obj, int r, int g, int b)
diff --git a/efl/elementary/background.pyx b/efl/elementary/background.pyx
index c9c6605..da48ca3 100644
--- a/efl/elementary/background.pyx
+++ b/efl/elementary/background.pyx
@@ -116,8 +116,8 @@ cdef class Background(LayoutClass):
116 """ 116 """
117 def __get__(self): 117 def __get__(self):
118 cdef: 118 cdef:
119 const_char *filename 119 const char *filename
120 const_char *group 120 const char *group
121 121
122 elm_bg_file_get(self.obj, &filename, &group) 122 elm_bg_file_get(self.obj, &filename, &group)
123 return (_ctouni(filename), _ctouni(group)) 123 return (_ctouni(filename), _ctouni(group))
@@ -132,21 +132,21 @@ cdef class Background(LayoutClass):
132 if isinstance(filename, unicode): filename = PyUnicode_AsUTF8String(filename) 132 if isinstance(filename, unicode): filename = PyUnicode_AsUTF8String(filename)
133 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group) 133 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group)
134 if not elm_bg_file_set(self.obj, 134 if not elm_bg_file_set(self.obj,
135 <const_char *>filename if filename is not None else NULL, 135 <const char *>filename if filename is not None else NULL,
136 <const_char *>group if group is not None else NULL): 136 <const char *>group if group is not None else NULL):
137 raise RuntimeError("Could not set background file.") 137 raise RuntimeError("Could not set background file.")
138 138
139 def file_set(self, filename, group = None): 139 def file_set(self, filename, group = None):
140 if isinstance(filename, unicode): filename = PyUnicode_AsUTF8String(filename) 140 if isinstance(filename, unicode): filename = PyUnicode_AsUTF8String(filename)
141 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group) 141 if isinstance(group, unicode): group = PyUnicode_AsUTF8String(group)
142 if not elm_bg_file_set(self.obj, 142 if not elm_bg_file_set(self.obj,
143 <const_char *>filename if filename is not None else NULL, 143 <const char *>filename if filename is not None else NULL,
144 <const_char *>group if group is not None else NULL): 144 <const char *>group if group is not None else NULL):
145 raise RuntimeError("Could not set background file.") 145 raise RuntimeError("Could not set background file.")
146 def file_get(self): 146 def file_get(self):
147 cdef: 147 cdef:
148 const_char *filename 148 const char *filename
149 const_char *group 149 const char *group
150 150
151 elm_bg_file_get(self.obj, &filename, &group) 151 elm_bg_file_get(self.obj, &filename, &group)
152 return (_ctouni(filename), _ctouni(group)) 152 return (_ctouni(filename), _ctouni(group))
diff --git a/efl/elementary/box.pxd b/efl/elementary/box.pxd
index c6f668b..280a463 100644
--- a/efl/elementary/box.pxd
+++ b/efl/elementary/box.pxd
@@ -1,4 +1,4 @@
1from efl.evas cimport Eina_Bool, Eina_List, const_Eina_List, Evas_Object, Evas_Coord 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object, Evas_Coord
2from enums cimport Elm_Box_CLayout 2from enums cimport Elm_Box_CLayout
3 3
4cdef extern from "Ecore.h": 4cdef extern from "Ecore.h":
diff --git a/efl/elementary/calendar_elm.pxd b/efl/elementary/calendar_elm.pxd
index b2cf18a..2d8a492 100644
--- a/efl/elementary/calendar_elm.pxd
+++ b/efl/elementary/calendar_elm.pxd
@@ -1,7 +1,6 @@
1from efl.evas cimport Eina_Bool, Eina_List, const_Eina_List, Evas_Object 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Object
2from enums cimport Elm_Calendar_Mark_Repeat_Type, Elm_Calendar_Select_Mode, \ 2from enums cimport Elm_Calendar_Mark_Repeat_Type, Elm_Calendar_Select_Mode, \
3 Elm_Calendar_Selectable, Elm_Calendar_Weekday 3 Elm_Calendar_Selectable, Elm_Calendar_Weekday
4from libc.string cimport const_char
5 4
6cdef extern from "string.h": 5cdef extern from "string.h":
7 void *memcpy(void *dst, void *src, int n) 6 void *memcpy(void *dst, void *src, int n)
@@ -20,7 +19,7 @@ cdef extern from "time.h":
20 int tm_isdst 19 int tm_isdst
21 20
22 long int tm_gmtoff 21 long int tm_gmtoff
23 const_char *tm_zone 22 const char *tm_zone
24 23
25cdef extern from "Elementary.h": 24cdef extern from "Elementary.h":
26 25
@@ -30,8 +29,8 @@ cdef extern from "Elementary.h":
30 pass 29 pass
31 30
32 Evas_Object * elm_calendar_add(Evas_Object *parent) 31 Evas_Object * elm_calendar_add(Evas_Object *parent)
33 const_char ** elm_calendar_weekdays_names_get(Evas_Object *obj) 32 const char ** elm_calendar_weekdays_names_get(Evas_Object *obj)
34 void elm_calendar_weekdays_names_set(Evas_Object *obj, const_char *weekdays[]) 33 void elm_calendar_weekdays_names_set(Evas_Object *obj, const char *weekdays[])
35 void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max) 34 void elm_calendar_min_max_year_set(Evas_Object *obj, int min, int max)
36 void elm_calendar_min_max_year_get(Evas_Object *obj, int *min, int *max) 35 void elm_calendar_min_max_year_get(Evas_Object *obj, int *min, int *max)
37 void elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode) 36 void elm_calendar_select_mode_set(Evas_Object *obj, Elm_Calendar_Select_Mode mode)
@@ -39,10 +38,10 @@ cdef extern from "Elementary.h":
39 void elm_calendar_selected_time_set(Evas_Object *obj, tm *selected_time) 38 void elm_calendar_selected_time_set(Evas_Object *obj, tm *selected_time)
40 Eina_Bool elm_calendar_selected_time_get(Evas_Object *obj, tm *selected_time) 39 Eina_Bool elm_calendar_selected_time_get(Evas_Object *obj, tm *selected_time)
41 #TODO: void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func) 40 #TODO: void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func)
42 Elm_Calendar_Mark * elm_calendar_mark_add(Evas_Object *obj, const_char *mark_type, tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat) 41 Elm_Calendar_Mark * elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat)
43 void elm_calendar_mark_del(Elm_Calendar_Mark *mark) 42 void elm_calendar_mark_del(Elm_Calendar_Mark *mark)
44 void elm_calendar_marks_clear(Evas_Object *obj) 43 void elm_calendar_marks_clear(Evas_Object *obj)
45 const_Eina_List * elm_calendar_marks_get(Evas_Object *obj) 44 const Eina_List * elm_calendar_marks_get(Evas_Object *obj)
46 void elm_calendar_marks_draw(Evas_Object *obj) 45 void elm_calendar_marks_draw(Evas_Object *obj)
47 void elm_calendar_interval_set(Evas_Object *obj, double interval) 46 void elm_calendar_interval_set(Evas_Object *obj, double interval)
48 double elm_calendar_interval_get(Evas_Object *obj) 47 double elm_calendar_interval_get(Evas_Object *obj)
diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx
index 8f2829f..ab278c7 100644
--- a/efl/elementary/calendar_elm.pyx
+++ b/efl/elementary/calendar_elm.pyx
@@ -263,7 +263,7 @@ cdef class CalendarMark(object):
263 time.tm_isdst = tmtup.tm_isdst 263 time.tm_isdst = tmtup.tm_isdst
264 if isinstance(mark_type, unicode): mark_type = PyUnicode_AsUTF8String(mark_type) 264 if isinstance(mark_type, unicode): mark_type = PyUnicode_AsUTF8String(mark_type)
265 self.obj = elm_calendar_mark_add(cal.obj, 265 self.obj = elm_calendar_mark_add(cal.obj,
266 <const_char *>mark_type if mark_type is not None else NULL, 266 <const char *>mark_type if mark_type is not None else NULL,
267 &time, repeat) 267 &time, repeat)
268 268
269 def delete(self): 269 def delete(self):
@@ -448,7 +448,7 @@ cdef class Calendar(LayoutClass):
448 def __get__(self): 448 def __get__(self):
449 cdef: 449 cdef:
450 Elm_Calendar_Mark *obj 450 Elm_Calendar_Mark *obj
451 const_Eina_List *lst = elm_calendar_marks_get(self.obj) 451 const Eina_List *lst = elm_calendar_marks_get(self.obj)
452 list ret = list() 452 list ret = list()
453 CalendarMark o 453 CalendarMark o
454 454
diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi
index 1081f53..fdd6520 100644
--- a/efl/elementary/cnp_callbacks.pxi
+++ b/efl/elementary/cnp_callbacks.pxi
@@ -26,7 +26,7 @@ cdef extern from "Elementary.h":
26 26
27 struct _Elm_Drag_User_Info: 27 struct _Elm_Drag_User_Info:
28 Elm_Sel_Format format 28 Elm_Sel_Format format
29 const_char *data 29 const char *data
30 Eina_List *icons 30 Eina_List *icons
31 Elm_Xdnd_Action action 31 Elm_Xdnd_Action action
32 Elm_Drag_Icon_Create_Cb createicon 32 Elm_Drag_Icon_Create_Cb createicon
@@ -56,13 +56,13 @@ cdef extern from "Elementary.h":
56 Elm_Drop_Item_Container_Cb dropcb, void *cbdata) 56 Elm_Drop_Item_Container_Cb dropcb, void *cbdata)
57 Eina_Bool elm_drop_item_container_del(Evas_Object *obj) 57 Eina_Bool elm_drop_item_container_del(Evas_Object *obj)
58 58
59 Eina_Bool elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const_void *buf, size_t buflen) 59 Eina_Bool elm_cnp_selection_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *buf, size_t buflen)
60 Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata) 60 Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata)
61 Eina_Bool elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection) 61 Eina_Bool elm_object_cnp_selection_clear(Evas_Object *obj, Elm_Sel_Type selection)
62 void elm_cnp_selection_loss_callback_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const_void *data) 62 void elm_cnp_selection_loss_callback_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data)
63 # Eina_Bool elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *cbdata) 63 # Eina_Bool elm_drop_target_add(Evas_Object *obj, Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb dropcb, void *cbdata)
64 # Eina_Bool elm_drop_target_del(Evas_Object *obj) 64 # Eina_Bool elm_drop_target_del(Evas_Object *obj)
65 # Eina_Bool elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const_char *data, Elm_Xdnd_Action action, Elm_Drag_Icon_Create_Cb createicon, void *createdata, Elm_Drag_Pos dragpos, void *dragdata, Elm_Drag_Accept acceptcb, void *acceptdata, Elm_Drag_State dragdone, void *donecbdata) 65 # Eina_Bool elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, Elm_Xdnd_Action action, Elm_Drag_Icon_Create_Cb createicon, void *createdata, Elm_Drag_Pos dragpos, void *dragdata, Elm_Drag_Accept acceptcb, void *acceptdata, Elm_Drag_State dragdone, void *donecbdata)
66 # Eina_Bool elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action) 66 # Eina_Bool elm_drag_action_set(Evas_Object *obj, Elm_Xdnd_Action action)
67 67
68cdef class SelectionData(object): 68cdef class SelectionData(object):
@@ -89,7 +89,7 @@ cdef class SelectionData(object):
89 property data: 89 property data:
90 def __get__(self): 90 def __get__(self):
91 # TODO: void * 91 # TODO: void *
92 return <const_char *>self.sel_data.data 92 return <const char *>self.sel_data.data
93 93
94 property len: 94 property len:
95 """:type: size_t""" 95 """:type: size_t"""
@@ -385,7 +385,7 @@ cdef class DragUserInfo(object):
385 public list icons 385 public list icons
386 public object createicon, createdata, dragpos, dragdata 386 public object createicon, createdata, dragpos, dragdata
387 public object acceptcb, acceptdata, dragdone, donecbdata 387 public object acceptcb, acceptdata, dragdone, donecbdata
388 const_char *_data 388 const char *_data
389 389
390 property data: 390 property data:
391 def __get__(self): 391 def __get__(self):
diff --git a/efl/elementary/colorselector.pxd b/efl/elementary/colorselector.pxd
index 8f6b018..da02a59 100644
--- a/efl/elementary/colorselector.pxd
+++ b/efl/elementary/colorselector.pxd
@@ -1,7 +1,6 @@
1from efl.evas cimport Evas_Object, const_Evas_Object, const_Eina_List, Eina_Bool 1from efl.evas cimport Evas_Object, Eina_List, Eina_Bool
2from object_item cimport Elm_Object_Item, const_Elm_Object_Item 2from object_item cimport Elm_Object_Item
3from enums cimport Elm_Colorselector_Mode 3from enums cimport Elm_Colorselector_Mode
4from libc.string cimport const_char
5 4
6cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
7 Evas_Object * elm_colorselector_add(Evas_Object *parent) 6 Evas_Object * elm_colorselector_add(Evas_Object *parent)
@@ -13,9 +12,9 @@ cdef extern from "Elementary.h":
13 void elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int r, int g, int b, int a) 12 void elm_colorselector_palette_item_color_set(Elm_Object_Item *it, int r, int g, int b, int a)
14 Elm_Object_Item * elm_colorselector_palette_color_add(Evas_Object *obj, int r, int g, int b, int a) 13 Elm_Object_Item * elm_colorselector_palette_color_add(Evas_Object *obj, int r, int g, int b, int a)
15 void elm_colorselector_palette_clear(Evas_Object *obj) 14 void elm_colorselector_palette_clear(Evas_Object *obj)
16 void elm_colorselector_palette_name_set(Evas_Object *obj, const_char *palette_name) 15 void elm_colorselector_palette_name_set(Evas_Object *obj, const char *palette_name)
17 const_char * elm_colorselector_palette_name_get(Evas_Object *obj) 16 const char * elm_colorselector_palette_name_get(Evas_Object *obj)
18 const_Eina_List * elm_colorselector_palette_items_get(const_Evas_Object *obj) 17 const Eina_List * elm_colorselector_palette_items_get(const Evas_Object *obj)
19 Eina_Bool elm_colorselector_palette_item_selected_get(const_Elm_Object_Item *it) 18 Eina_Bool elm_colorselector_palette_item_selected_get(const Elm_Object_Item *it)
20 void elm_colorselector_palette_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) 19 void elm_colorselector_palette_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
21 Elm_Object_Item * elm_colorselector_palette_selected_item_get(const_Evas_Object *obj) 20 Elm_Object_Item * elm_colorselector_palette_selected_item_get(const Evas_Object *obj)
diff --git a/efl/elementary/colorselector.pyx b/efl/elementary/colorselector.pyx
index f75817b..6620a66 100644
--- a/efl/elementary/colorselector.pyx
+++ b/efl/elementary/colorselector.pyx
@@ -240,13 +240,13 @@ cdef class Colorselector(LayoutClass):
240 s = palette_name 240 s = palette_name
241 if isinstance(s, unicode): s = PyUnicode_AsUTF8String(s) 241 if isinstance(s, unicode): s = PyUnicode_AsUTF8String(s)
242 elm_colorselector_palette_name_set(self.obj, 242 elm_colorselector_palette_name_set(self.obj,
243 <const_char *>s if s is not None else NULL) 243 <const char *>s if s is not None else NULL)
244 244
245 def palette_name_set(self, palette_name): 245 def palette_name_set(self, palette_name):
246 s = palette_name 246 s = palette_name
247 if isinstance(s, unicode): s = PyUnicode_AsUTF8String(s) 247 if isinstance(s, unicode): s = PyUnicode_AsUTF8String(s)
248 elm_colorselector_palette_name_set(self.obj, 248 elm_colorselector_palette_name_set(self.obj,
249 <const_char *>s if s is not None else NULL) 249 <const char *>s if s is not None else NULL)
250 def palette_name_get(self): 250 def palette_name_get(self):
251 return _ctouni(elm_colorselector_palette_name_get(self.obj)) 251 return _ctouni(elm_colorselector_palette_name_get(self.obj))
252 252
@@ -263,7 +263,7 @@ cdef class Colorselector(LayoutClass):
263 """ 263 """
264 cdef: 264 cdef:
265 list ret = list() 265 list ret = list()
266 const_Eina_List *lst = elm_colorselector_palette_items_get(self.obj) 266 const Eina_List *lst = elm_colorselector_palette_items_get(self.obj)
267 267
268 while lst: 268 while lst:
269 ret.append(_object_item_to_python(<Elm_Object_Item *>lst.data)) 269 ret.append(_object_item_to_python(<Elm_Object_Item *>lst.data))
diff --git a/efl/elementary/configuration.pxd b/efl/elementary/configuration.pxd
index e721f85..f3e4a43 100644
--- a/efl/elementary/configuration.pxd
+++ b/efl/elementary/configuration.pxd
@@ -1,27 +1,27 @@
1from efl.evas cimport Eina_Bool, Eina_List, const_Eina_List, Evas_Coord, Evas_Object, Evas_Font_Size 1from efl.evas cimport Eina_Bool, Eina_List, Evas_Coord, Evas_Object, \
2from libc.string cimport const_char 2 Evas_Font_Size
3from enums cimport Elm_Softcursor_Mode 3from enums cimport Elm_Softcursor_Mode
4 4
5cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
6 ctypedef struct Elm_Font_Overlay: 6 ctypedef struct Elm_Font_Overlay:
7 const_char *text_class 7 const char *text_class
8 const_char *font 8 const char *font
9 Evas_Font_Size size 9 Evas_Font_Size size
10 10
11 ctypedef struct Elm_Text_Class: 11 ctypedef struct Elm_Text_Class:
12 const_char *name 12 const char *name
13 const_char *desc 13 const char *desc
14 14
15 Eina_Bool elm_config_save() 15 Eina_Bool elm_config_save()
16 void elm_config_reload() 16 void elm_config_reload()
17 void elm_config_all_flush() 17 void elm_config_all_flush()
18 18
19 const_char * elm_config_profile_get() 19 const char * elm_config_profile_get()
20 const_char * elm_config_profile_dir_get(const_char *profile, Eina_Bool is_user) 20 const char * elm_config_profile_dir_get(const char *profile, Eina_Bool is_user)
21 void elm_config_profile_dir_free(const_char *p_dir) 21 void elm_config_profile_dir_free(const char *p_dir)
22 Eina_List * elm_config_profile_list_get() 22 Eina_List * elm_config_profile_list_get()
23 void elm_config_profile_list_free(Eina_List *l) 23 void elm_config_profile_list_free(Eina_List *l)
24 void elm_config_profile_set(const_char *profile) 24 void elm_config_profile_set(const char *profile)
25 25
26 Eina_Bool elm_config_scroll_bounce_enabled_get() 26 Eina_Bool elm_config_scroll_bounce_enabled_get()
27 void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled) 27 void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled)
@@ -77,20 +77,20 @@ cdef extern from "Elementary.h":
77 double elm_config_password_show_last_timeout_get() 77 double elm_config_password_show_last_timeout_get()
78 void elm_config_password_show_last_timeout_set(double password_show_last_timeout) 78 void elm_config_password_show_last_timeout_set(double password_show_last_timeout)
79 79
80 const_char * elm_config_engine_get() 80 const char * elm_config_engine_get()
81 void elm_config_engine_set(const_char *engine) 81 void elm_config_engine_set(const char *engine)
82 const_char * elm_config_preferred_engine_get() 82 const char * elm_config_preferred_engine_get()
83 void elm_config_preferred_engine_set(const_char *engine) 83 void elm_config_preferred_engine_set(const char *engine)
84 84
85 Eina_List * elm_config_text_classes_list_get() 85 Eina_List * elm_config_text_classes_list_get()
86 void elm_config_text_classes_list_free(Eina_List *list) 86 void elm_config_text_classes_list_free(Eina_List *list)
87 Eina_List * elm_config_font_overlay_list_get() 87 Eina_List * elm_config_font_overlay_list_get()
88 void elm_config_font_overlay_set(const_char *text_class, const_char *font, Evas_Font_Size size) 88 void elm_config_font_overlay_set(const char *text_class, const char *font, Evas_Font_Size size)
89 #TODO: Eina_Bool elm_config_access_get() 89 #TODO: Eina_Bool elm_config_access_get()
90 #TODO: void elm_config_access_set(Eina_Bool is_access) 90 #TODO: void elm_config_access_set(Eina_Bool is_access)
91 Eina_Bool elm_config_selection_unfocused_clear_get() 91 Eina_Bool elm_config_selection_unfocused_clear_get()
92 void elm_config_selection_unfocused_clear_set(Eina_Bool enabled) 92 void elm_config_selection_unfocused_clear_set(Eina_Bool enabled)
93 void elm_config_font_overlay_unset(const_char *text_class) 93 void elm_config_font_overlay_unset(const char *text_class)
94 void elm_config_font_overlay_apply() 94 void elm_config_font_overlay_apply()
95 Evas_Coord elm_config_finger_size_get() 95 Evas_Coord elm_config_finger_size_get()
96 void elm_config_finger_size_set(Evas_Coord size) 96 void elm_config_finger_size_set(Evas_Coord size)
@@ -118,7 +118,7 @@ cdef extern from "Elementary.h":
118 Eina_Bool elm_config_clouseau_enabled_get() 118 Eina_Bool elm_config_clouseau_enabled_get()
119 void elm_config_clouseau_enabled_set(Eina_Bool enabled) 119 void elm_config_clouseau_enabled_set(Eina_Bool enabled)
120 120
121 const_char * elm_config_indicator_service_get(int rotation) 121 const char * elm_config_indicator_service_get(int rotation)
122 122
123 double elm_config_glayer_long_tap_start_timeout_get() 123 double elm_config_glayer_long_tap_start_timeout_get()
124 void elm_config_glayer_long_tap_start_timeout_set(double long_tap_timeout) 124 void elm_config_glayer_long_tap_start_timeout_set(double long_tap_timeout)
diff --git a/efl/elementary/configuration.pyx b/efl/elementary/configuration.pyx
index 7aef555..609e15d 100644
--- a/efl/elementary/configuration.pyx
+++ b/efl/elementary/configuration.pyx
@@ -168,7 +168,7 @@ cdef class Configuration(object):
168 return _ctouni(elm_config_profile_get()) 168 return _ctouni(elm_config_profile_get())
169 def __set__(self, profile): 169 def __set__(self, profile):
170 if isinstance(profile, unicode): profile = PyUnicode_AsUTF8String(profile) 170 if isinstance(profile, unicode): profile = PyUnicode_AsUTF8String(profile)
171 elm_config_profile_set(<const_char *>profile if profile is not None else NULL) 171 elm_config_profile_set(<const char *>profile if profile is not None else NULL)
172 172
173 def profile_dir_get(self, profile, bint is_user): 173 def profile_dir_get(self, profile, bint is_user):
174 """profile_dir_get(unicode profile, bool is_user) 174 """profile_dir_get(unicode profile, bool is_user)
@@ -188,7 +188,7 @@ cdef class Configuration(object):
188 """ 188 """
189 if isinstance(profile, unicode): profile = PyUnicode_AsUTF8String(profile) 189 if isinstance(profile, unicode): profile = PyUnicode_AsUTF8String(profile)
190 return _ctouni(elm_config_profile_dir_get( 190 return _ctouni(elm_config_profile_dir_get(
191 <const_char *>profile if profile is not None else NULL, 191 <const char *>profile if profile is not None else NULL,
192 is_user)) 192 is_user))
193 193
194 property profile_list: 194 property profile_list:
@@ -561,7 +561,7 @@ cdef class Configuration(object):
561 def __set__(self, engine): 561 def __set__(self, engine):
562 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine) 562 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine)
563 elm_config_engine_set( 563 elm_config_engine_set(
564 <const_char *>engine if engine is not None else NULL) 564 <const char *>engine if engine is not None else NULL)
565 565
566 property preferred_engine: 566 property preferred_engine:
567 """Get Elementary's preferred engine to use. 567 """Get Elementary's preferred engine to use.
@@ -581,7 +581,7 @@ cdef class Configuration(object):
581 def __set__(self, engine): 581 def __set__(self, engine):
582 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine) 582 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine)
583 elm_config_preferred_engine_set( 583 elm_config_preferred_engine_set(
584 <const_char *>engine if engine is not None else NULL) 584 <const char *>engine if engine is not None else NULL)
585 585
586 property text_classes_list: 586 property text_classes_list:
587 """Get Elementary's list of supported text classes. 587 """Get Elementary's list of supported text classes.
@@ -593,8 +593,8 @@ cdef class Configuration(object):
593 cdef: 593 cdef:
594 Eina_List *lst 594 Eina_List *lst
595 Elm_Text_Class *data 595 Elm_Text_Class *data
596 const_char *name 596 const char *name
597 const_char *desc 597 const char *desc
598 598
599 ret = [] 599 ret = []
600 lst = elm_config_text_classes_list_get() 600 lst = elm_config_text_classes_list_get()
@@ -621,10 +621,10 @@ cdef class Configuration(object):
621 """ 621 """
622 def __get__(self): 622 def __get__(self):
623 cdef: 623 cdef:
624 const_Eina_List *lst 624 const Eina_List *lst
625 Elm_Font_Overlay *data 625 Elm_Font_Overlay *data
626 const_char *text_class 626 const char *text_class
627 const_char *font 627 const char *font
628 Evas_Font_Size size 628 Evas_Font_Size size
629 629
630 ret = [] 630 ret = []
@@ -667,8 +667,8 @@ cdef class Configuration(object):
667 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) 667 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1)
668 if isinstance(a2, unicode): a2 = PyUnicode_AsUTF8String(a2) 668 if isinstance(a2, unicode): a2 = PyUnicode_AsUTF8String(a2)
669 elm_config_font_overlay_set( 669 elm_config_font_overlay_set(
670 <const_char *>a1 if a1 is not None else NULL, 670 <const char *>a1 if a1 is not None else NULL,
671 <const_char *>a2 if a2 is not None else NULL, 671 <const char *>a2 if a2 is not None else NULL,
672 size) 672 size)
673 673
674 # TODO: 674 # TODO:
@@ -717,7 +717,7 @@ cdef class Configuration(object):
717 a1 = text_class 717 a1 = text_class
718 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) 718 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1)
719 elm_config_font_overlay_unset( 719 elm_config_font_overlay_unset(
720 <const_char *>a1 if a1 is not None else NULL) 720 <const char *>a1 if a1 is not None else NULL)
721 721
722 def font_overlay_apply(self): 722 def font_overlay_apply(self):
723 """font_overlay_apply() 723 """font_overlay_apply()
@@ -955,14 +955,14 @@ def preferred_engine_get():
955def preferred_engine_set(engine): 955def preferred_engine_set(engine):
956 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine) 956 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine)
957 elm_config_preferred_engine_set( 957 elm_config_preferred_engine_set(
958 <const_char *>engine if engine is not None else NULL) 958 <const char *>engine if engine is not None else NULL)
959 959
960def engine_get(): 960def engine_get():
961 return _ctouni(elm_config_engine_get()) 961 return _ctouni(elm_config_engine_get())
962def engine_set(engine): 962def engine_set(engine):
963 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine) 963 if isinstance(engine, unicode): engine = PyUnicode_AsUTF8String(engine)
964 elm_config_engine_set( 964 elm_config_engine_set(
965 <const_char *>engine if engine is not None else NULL) 965 <const char *>engine if engine is not None else NULL)
966 966
967def scale_get(): 967def scale_get():
968 return elm_config_scale_get() 968 return elm_config_scale_get()
diff --git a/efl/elementary/ctxpopup.pxd b/efl/elementary/ctxpopup.pxd
index 47bf43f..db0b85d 100644
--- a/efl/elementary/ctxpopup.pxd
+++ b/efl/elementary/ctxpopup.pxd
@@ -1,7 +1,6 @@
1from efl.evas cimport Eina_Bool, Evas_Object, const_Evas_Object, Evas_Smart_Cb 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
2from object_item cimport Elm_Object_Item 2from object_item cimport Elm_Object_Item
3from enums cimport Elm_Ctxpopup_Direction 3from enums cimport Elm_Ctxpopup_Direction
4from libc.string cimport const_char
5 4
6cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
7 Evas_Object *elm_ctxpopup_add(Evas_Object *parent) 6 Evas_Object *elm_ctxpopup_add(Evas_Object *parent)
@@ -10,11 +9,11 @@ cdef extern from "Elementary.h":
10 void elm_ctxpopup_clear(Evas_Object *obj) 9 void elm_ctxpopup_clear(Evas_Object *obj)
11 void elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 10 void elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
12 Eina_Bool elm_ctxpopup_horizontal_get(Evas_Object *obj) 11 Eina_Bool elm_ctxpopup_horizontal_get(Evas_Object *obj)
13 Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, const_char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data) 12 Elm_Object_Item *elm_ctxpopup_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data)
14 void elm_ctxpopup_direction_priority_set(Evas_Object *obj, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth) 13 void elm_ctxpopup_direction_priority_set(Evas_Object *obj, Elm_Ctxpopup_Direction first, Elm_Ctxpopup_Direction second, Elm_Ctxpopup_Direction third, Elm_Ctxpopup_Direction fourth)
15 void elm_ctxpopup_direction_priority_get(Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth) 14 void elm_ctxpopup_direction_priority_get(Evas_Object *obj, Elm_Ctxpopup_Direction *first, Elm_Ctxpopup_Direction *second, Elm_Ctxpopup_Direction *third, Elm_Ctxpopup_Direction *fourth)
16 Elm_Ctxpopup_Direction elm_ctxpopup_direction_get(Evas_Object *obj) 15 Elm_Ctxpopup_Direction elm_ctxpopup_direction_get(Evas_Object *obj)
17 void elm_ctxpopup_dismiss(Evas_Object *obj) 16 void elm_ctxpopup_dismiss(Evas_Object *obj)
18 void elm_ctxpopup_auto_hide_disabled_set(Evas_Object *obj, Eina_Bool disabled) 17 void elm_ctxpopup_auto_hide_disabled_set(Evas_Object *obj, Eina_Bool disabled)
19 Eina_Bool elm_ctxpopup_auto_hide_disabled_get(const_Evas_Object *obj) 18 Eina_Bool elm_ctxpopup_auto_hide_disabled_get(const Evas_Object *obj)
20 19
diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx
index ec895bd..26e560c 100644
--- a/efl/elementary/ctxpopup.pyx
+++ b/efl/elementary/ctxpopup.pyx
@@ -167,7 +167,7 @@ cdef class CtxpopupItem(ObjectItem):
167 cb = _object_item_callback2 167 cb = _object_item_callback2
168 168
169 item = elm_ctxpopup_item_append(ctxpopup.obj, 169 item = elm_ctxpopup_item_append(ctxpopup.obj,
170 <const_char *>self.label if self.label is not None else NULL, 170 <const char *>self.label if self.label is not None else NULL,
171 self.icon.obj if self.icon is not None else NULL, 171 self.icon.obj if self.icon is not None else NULL,
172 cb, <void*>self) 172 cb, <void*>self)
173 173
@@ -249,7 +249,7 @@ cdef class Ctxpopup(LayoutClass):
249 if isinstance(label, unicode): label = PyUnicode_AsUTF8String(label) 249 if isinstance(label, unicode): label = PyUnicode_AsUTF8String(label)
250 250
251 item = elm_ctxpopup_item_append(self.obj, 251 item = elm_ctxpopup_item_append(self.obj,
252 <const_char *>label if label is not None else NULL, 252 <const char *>label if label is not None else NULL,
253 icon.obj if icon is not None else NULL, 253 icon.obj if icon is not None else NULL,
254 cb, <void*>ret) 254 cb, <void*>ret)
255 255
diff --git a/efl/elementary/datetime_elm.pxd b/efl/elementary/datetime_elm.pxd
index d760e5d..8a23479 100644
--- a/efl/elementary/datetime_elm.pxd
+++ b/efl/elementary/datetime_elm.pxd
@@ -1,12 +1,11 @@
1from efl.evas cimport Evas_Object, Eina_Bool 1from efl.evas cimport Evas_Object, Eina_Bool
2from general cimport tm 2from general cimport tm
3from enums cimport Elm_Datetime_Field_Type 3from enums cimport Elm_Datetime_Field_Type
4from libc.string cimport const_char
5 4
6cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
7 Evas_Object * elm_datetime_add(Evas_Object *parent) 6 Evas_Object * elm_datetime_add(Evas_Object *parent)
8 const_char * elm_datetime_format_get(Evas_Object *obj) 7 const char * elm_datetime_format_get(Evas_Object *obj)
9 void elm_datetime_format_set(Evas_Object *obj, const_char *fmt) 8 void elm_datetime_format_set(Evas_Object *obj, const char *fmt)
10 Eina_Bool elm_datetime_value_max_get(Evas_Object *obj, tm *maxtime) 9 Eina_Bool elm_datetime_value_max_get(Evas_Object *obj, tm *maxtime)
11 Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, tm *maxtime) 10 Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, tm *maxtime)
12 Eina_Bool elm_datetime_value_min_get(Evas_Object *obj, tm *mintime) 11 Eina_Bool elm_datetime_value_min_get(Evas_Object *obj, tm *mintime)
diff --git a/efl/elementary/datetime_elm.pyx b/efl/elementary/datetime_elm.pyx
index c914031..c05a163 100644
--- a/efl/elementary/datetime_elm.pyx
+++ b/efl/elementary/datetime_elm.pyx
@@ -377,7 +377,7 @@ cdef class Datetime(Object):
377 def __set__(self, fmt): 377 def __set__(self, fmt):
378 if isinstance(fmt, unicode): fmt = PyUnicode_AsUTF8String(fmt) 378 if isinstance(fmt, unicode): fmt = PyUnicode_AsUTF8String(fmt)
379 elm_datetime_format_set(self.obj, 379 elm_datetime_format_set(self.obj,
380 <const_char *>fmt if fmt is not None else NULL) 380 <const char *>fmt if fmt is not None else NULL)
381 381
382 property value_max: 382 property value_max:
383 """The upper boundary of a field. 383 """The upper boundary of a field.
diff --git a/efl/elementary/dayselector.pxd b/efl/elementary/dayselector.pxd
index 5e32e96..5375c43 100644
--- a/efl/elementary/dayselector.pxd
+++ b/efl/elementary/dayselector.pxd
@@ -1,16 +1,15 @@
1from efl.evas cimport Eina_Bool, Evas_Object, const_Evas_Object, Eina_List 1from efl.evas cimport Eina_Bool, Evas_Object, Eina_List
2from enums cimport Elm_Dayselector_Day 2from enums cimport Elm_Dayselector_Day
3from libc.string cimport const_char
4 3
5cdef extern from "Elementary.h": 4cdef extern from "Elementary.h":
6 Evas_Object *elm_dayselector_add(Evas_Object *parent) 5 Evas_Object *elm_dayselector_add(Evas_Object *parent)
7 void elm_dayselector_day_selected_set(Evas_Object *obj, Elm_Dayselector_Day day, Eina_Bool selected) 6 void elm_dayselector_day_selected_set(Evas_Object *obj, Elm_Dayselector_Day day, Eina_Bool selected)
8 Eina_Bool elm_dayselector_day_selected_get(const_Evas_Object *obj, Elm_Dayselector_Day day) 7 Eina_Bool elm_dayselector_day_selected_get(const Evas_Object *obj, Elm_Dayselector_Day day)
9 void elm_dayselector_week_start_set(Evas_Object *obj, Elm_Dayselector_Day day) 8 void elm_dayselector_week_start_set(Evas_Object *obj, Elm_Dayselector_Day day)
10 Elm_Dayselector_Day elm_dayselector_week_start_get(const_Evas_Object *obj) 9 Elm_Dayselector_Day elm_dayselector_week_start_get(const Evas_Object *obj)
11 void elm_dayselector_weekend_start_set(Evas_Object *obj, Elm_Dayselector_Day day) 10 void elm_dayselector_weekend_start_set(Evas_Object *obj, Elm_Dayselector_Day day)
12 Elm_Dayselector_Day elm_dayselector_weekend_start_get(const_Evas_Object *obj) 11 Elm_Dayselector_Day elm_dayselector_weekend_start_get(const Evas_Object *obj)
13 void elm_dayselector_weekend_length_set(Evas_Object *obj, unsigned int length) 12 void elm_dayselector_weekend_length_set(Evas_Object *obj, unsigned int length)
14 unsigned int elm_dayselector_weekend_length_get(const_Evas_Object *obj) 13 unsigned int elm_dayselector_weekend_length_get(const Evas_Object *obj)
15 void elm_dayselector_weekdays_names_set(Evas_Object *obj, const_char *weekdays[]) 14 void elm_dayselector_weekdays_names_set(Evas_Object *obj, const char *weekdays[])
16 Eina_List *elm_dayselector_weekdays_names_get(const_Evas_Object *obj) 15 Eina_List *elm_dayselector_weekdays_names_get(const Evas_Object *obj)
diff --git a/efl/elementary/diskselector.pxd b/efl/elementary/diskselector.pxd
index 368e4d8..ac31126 100644
--- a/efl/elementary/diskselector.pxd
+++ b/efl/elementary/diskselector.pxd
@@ -1,7 +1,7 @@
1from efl.evas cimport Eina_Bool, const_Eina_List, Evas_Object, Evas_Smart_Cb 1from efl.eina cimport Eina_List
2from efl.evas cimport Eina_Bool, Evas_Object, Evas_Smart_Cb
2from object_item cimport Elm_Object_Item, ObjectItem 3from object_item cimport Elm_Object_Item, ObjectItem
3from enums cimport Elm_Scroller_Policy 4from enums cimport Elm_Scroller_Policy
4from libc.string cimport const_char
5 5
6cdef extern from "Elementary.h": 6cdef extern from "Elementary.h":
7 Evas_Object *elm_diskselector_add(Evas_Object *parent) 7 Evas_Object *elm_diskselector_add(Evas_Object *parent)
@@ -12,8 +12,8 @@ cdef extern from "Elementary.h":
12 void elm_diskselector_display_item_num_set(Evas_Object *obj, int num) 12 void elm_diskselector_display_item_num_set(Evas_Object *obj, int num)
13 int elm_diskselector_display_item_num_get(Evas_Object *obj) 13 int elm_diskselector_display_item_num_get(Evas_Object *obj)
14 void elm_diskselector_clear(Evas_Object *obj) 14 void elm_diskselector_clear(Evas_Object *obj)
15 const_Eina_List *elm_diskselector_items_get(Evas_Object *obj) 15 const Eina_List *elm_diskselector_items_get(Evas_Object *obj)
16 Elm_Object_Item *elm_diskselector_item_append(Evas_Object *obj, const_char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data) 16 Elm_Object_Item *elm_diskselector_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Smart_Cb func, void *data)
17 Elm_Object_Item *elm_diskselector_selected_item_get(Evas_Object *obj) 17 Elm_Object_Item *elm_diskselector_selected_item_get(Evas_Object *obj)
18 void elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) 18 void elm_diskselector_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
19 Eina_Bool elm_diskselector_item_selected_get(Elm_Object_Item *it) 19 Eina_Bool elm_diskselector_item_selected_get(Elm_Object_Item *it)
diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx
index e2b3686..a4df951 100644
--- a/efl/elementary/diskselector.pyx
+++ b/efl/elementary/diskselector.pyx
@@ -166,7 +166,7 @@ cdef class DiskselectorItem(ObjectItem):
166 cb = _object_item_callback2 166 cb = _object_item_callback2
167 167
168 item = elm_diskselector_item_append(diskselector.obj, 168 item = elm_diskselector_item_append(diskselector.obj,
169 <const_char *>self.label if self.label is not None else NULL, 169 <const char *>self.label if self.label is not None else NULL,
170 self.icon.obj if self.icon is not None else NULL, 170 self.icon.obj if self.icon is not None else NULL,
171 cb, <void*>self) 171 cb, <void*>self)
172 172
@@ -365,7 +365,7 @@ cdef class Diskselector(Object):
365 if isinstance(label, unicode): label = PyUnicode_AsUTF8String(label) 365 if isinstance(label, unicode): label = PyUnicode_AsUTF8String(label)
366 366
367 item = elm_diskselector_item_append(self.obj, 367 item = elm_diskselector_item_append(self.obj,
368 <const_char *>label if label is not None else NULL, 368 <const char *>label if label is not None else NULL,
369 icon.obj if icon is not None else NULL, 369 icon.obj if icon is not None else NULL,
370 cb, <void*>ret) 370 cb, <void*>ret)
371 371
diff --git a/efl/elementary/entry.pxd b/efl/elementary/entry.pxd
index 9932846..68bd53c 100644
--- a/efl/elementary/entry.pxd
+++ b/efl/elementary/entry.pxd
@@ -1,12 +1,10 @@
1from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \ 1from efl.evas cimport Eina_Bool, Eina_Rectangle, Evas_Object, \
2 const_Evas_Object, Evas_Coord, Evas_Smart_Cb 2 Evas_Coord, Evas_Smart_Cb
3from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \ 3from enums cimport Elm_Wrap_Type, Elm_Text_Format, Elm_Cnp_Mode, \
4 Elm_Scroller_Policy, Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \ 4 Elm_Scroller_Policy, Elm_Input_Panel_Layout, Elm_Input_Panel_Lang, \
5 Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \ 5 Elm_Input_Panel_Lang, Elm_Input_Panel_Return_Key_Type, \
6 Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \ 6 Elm_Autocapital_Type, Elm_Icon_Type, Elm_Sel_Type, Elm_Sel_Format, \
7 Elm_Xdnd_Action 7 Elm_Xdnd_Action
8from libc.string cimport const_char
9from libc.stdlib cimport const_void
10 8
11cdef extern from "Elementary.h": 9cdef extern from "Elementary.h":
12 ctypedef struct Elm_Entry_Anchor_Info: 10 ctypedef struct Elm_Entry_Anchor_Info:
@@ -36,8 +34,6 @@ cdef extern from "Elementary.h":
36 ctypedef struct Elm_Entry_Context_Menu_Item: 34 ctypedef struct Elm_Entry_Context_Menu_Item:
37 pass 35 pass
38 36
39 ctypedef Elm_Entry_Context_Menu_Item const_Elm_Entry_Context_Menu_Item "const Elm_Entry_Context_Menu_Item"
40
41 ctypedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text) 37 ctypedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text)
42 38
43 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev) 39 ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev)
@@ -49,25 +45,25 @@ cdef extern from "Elementary.h":
49 45
50 # Data for the elm_entry_filter_accept_set() entry filter. 46 # Data for the elm_entry_filter_accept_set() entry filter.
51 ctypedef struct Elm_Entry_Filter_Accept_Set: 47 ctypedef struct Elm_Entry_Filter_Accept_Set:
52 const_char *accepted # Set of characters accepted in the entry. 48 const char *accepted # Set of characters accepted in the entry.
53 const_char *rejected # Set of characters rejected from the entry. 49 const char *rejected # Set of characters rejected from the entry.
54 50
55 Evas_Object * elm_entry_add(Evas_Object *parent) 51 Evas_Object * elm_entry_add(Evas_Object *parent)
56 void elm_entry_text_style_user_push(Evas_Object *obj, const_char *style) 52 void elm_entry_text_style_user_push(Evas_Object *obj, const char *style)
57 void elm_entry_text_style_user_pop(Evas_Object *obj) 53 void elm_entry_text_style_user_pop(Evas_Object *obj)
58 const_char* elm_entry_text_style_user_peek(const_Evas_Object *obj) 54 const char* elm_entry_text_style_user_peek(const Evas_Object *obj)
59 void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line) 55 void elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
60 Eina_Bool elm_entry_single_line_get(Evas_Object *obj) 56 Eina_Bool elm_entry_single_line_get(Evas_Object *obj)
61 void elm_entry_password_set(Evas_Object *obj, Eina_Bool password) 57 void elm_entry_password_set(Evas_Object *obj, Eina_Bool password)
62 Eina_Bool elm_entry_password_get(Evas_Object *obj) 58 Eina_Bool elm_entry_password_get(Evas_Object *obj)
63 void elm_entry_entry_set(Evas_Object *obj, const_char *entry) 59 void elm_entry_entry_set(Evas_Object *obj, const char *entry)
64 const_char * elm_entry_entry_get(Evas_Object *obj) 60 const char * elm_entry_entry_get(Evas_Object *obj)
65 void elm_entry_entry_append(Evas_Object *obj, const_char *text) 61 void elm_entry_entry_append(Evas_Object *obj, const char *text)
66 Eina_Bool elm_entry_is_empty(Evas_Object *obj) 62 Eina_Bool elm_entry_is_empty(Evas_Object *obj)
67 const_char * elm_entry_selection_get(Evas_Object *obj) 63 const char * elm_entry_selection_get(Evas_Object *obj)
68 Evas_Object * elm_entry_textblock_get(Evas_Object *obj) 64 Evas_Object * elm_entry_textblock_get(Evas_Object *obj)
69 void elm_entry_calc_force(Evas_Object *obj) 65 void elm_entry_calc_force(Evas_Object *obj)
70 void elm_entry_entry_insert(Evas_Object *obj, const_char *entry) 66 void elm_entry_entry_insert(Evas_Object *obj, const char *entry)
71 void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap) 67 void elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap)
72 Elm_Wrap_Type elm_entry_line_wrap_get(Evas_Object *obj) 68 Elm_Wrap_Type elm_entry_line_wrap_get(Evas_Object *obj)
73 void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable) 69 void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable)
@@ -87,7 +83,7 @@ cdef extern from "Elementary.h":
87 void elm_entry_cursor_selection_end(Evas_Object *obj) 83 void elm_entry_cursor_selection_end(Evas_Object *obj)
88 Eina_Bool elm_entry_cursor_is_format_get(Evas_Object *obj) 84 Eina_Bool elm_entry_cursor_is_format_get(Evas_Object *obj)
89 Eina_Bool elm_entry_cursor_is_visible_format_get(Evas_Object *obj) 85 Eina_Bool elm_entry_cursor_is_visible_format_get(Evas_Object *obj)
90 const_char * elm_entry_cursor_content_get(Evas_Object *obj) 86 const char * elm_entry_cursor_content_get(Evas_Object *obj)
91 Eina_Bool elm_entry_cursor_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 87 Eina_Bool elm_entry_cursor_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
92 void elm_entry_cursor_pos_set(Evas_Object *obj, int pos) 88 void elm_entry_cursor_pos_set(Evas_Object *obj, int pos)
93 int elm_entry_cursor_pos_get(Evas_Object *obj) 89 int elm_entry_cursor_pos_get(Evas_Object *obj)
@@ -95,7 +91,7 @@ cdef extern from "Elementary.h":
95 void elm_entry_selection_copy(Evas_Object *obj) 91 void elm_entry_selection_copy(Evas_Object *obj)
96 void elm_entry_selection_paste(Evas_Object *obj) 92 void elm_entry_selection_paste(Evas_Object *obj)
97 void elm_entry_context_menu_clear(Evas_Object *obj) 93 void elm_entry_context_menu_clear(Evas_Object *obj)
98 void elm_entry_context_menu_item_add(Evas_Object *obj, const_char *label, const_char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const_void *data) 94 void elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data)
99 void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled) 95 void elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled)
100 Eina_Bool elm_entry_context_menu_disabled_get(Evas_Object *obj) 96 Eina_Bool elm_entry_context_menu_disabled_get(Evas_Object *obj)
101 # TODO: void elm_entry_item_provider_append(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data) 97 # TODO: void elm_entry_item_provider_append(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data)
@@ -104,10 +100,10 @@ cdef extern from "Elementary.h":
104 void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data) 100 void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
105 void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data) 101 void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
106 void elm_entry_markup_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data) 102 void elm_entry_markup_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data)
107 char * elm_entry_markup_to_utf8(const_char *s) 103 char * elm_entry_markup_to_utf8(const char *s)
108 char * elm_entry_utf8_to_markup(const_char *s) 104 char * elm_entry_utf8_to_markup(const char *s)
109 Eina_Bool elm_entry_file_set(Evas_Object *obj, const_char *file, Elm_Text_Format format) 105 Eina_Bool elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format)
110 void elm_entry_file_get(Evas_Object *obj, const_char **file, Elm_Text_Format *format) 106 void elm_entry_file_get(Evas_Object *obj, const char **file, Elm_Text_Format *format)
111 void elm_entry_file_save(Evas_Object *obj) 107 void elm_entry_file_save(Evas_Object *obj)
112 void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave) 108 void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave)
113 Eina_Bool elm_entry_autosave_get(Evas_Object *obj) 109 Eina_Bool elm_entry_autosave_get(Evas_Object *obj)
@@ -118,23 +114,23 @@ cdef extern from "Elementary.h":
118 void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout) 114 void elm_entry_input_panel_layout_set(Evas_Object *obj, Elm_Input_Panel_Layout layout)
119 Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj) 115 Elm_Input_Panel_Layout elm_entry_input_panel_layout_get(Evas_Object *obj)
120 void elm_entry_input_panel_layout_variation_set(Evas_Object *obj, int variation) 116 void elm_entry_input_panel_layout_variation_set(Evas_Object *obj, int variation)
121 int elm_entry_input_panel_layout_variation_get(const_Evas_Object *obj) 117 int elm_entry_input_panel_layout_variation_get(const Evas_Object *obj)
122 void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type) 118 void elm_entry_autocapital_type_set(Evas_Object *obj, Elm_Autocapital_Type autocapital_type)
123 Elm_Autocapital_Type elm_entry_autocapital_type_get(const_Evas_Object *obj) 119 Elm_Autocapital_Type elm_entry_autocapital_type_get(const Evas_Object *obj)
124 void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled) 120 void elm_entry_input_panel_enabled_set(Evas_Object *obj, Eina_Bool enabled)
125 Eina_Bool elm_entry_input_panel_enabled_get(Evas_Object *obj) 121 Eina_Bool elm_entry_input_panel_enabled_get(Evas_Object *obj)
126 void elm_entry_input_panel_show(Evas_Object *obj) 122 void elm_entry_input_panel_show(Evas_Object *obj)
127 void elm_entry_input_panel_hide(Evas_Object *obj) 123 void elm_entry_input_panel_hide(Evas_Object *obj)
128 void elm_entry_input_panel_language_set(Evas_Object *obj, Elm_Input_Panel_Lang lang) 124 void elm_entry_input_panel_language_set(Evas_Object *obj, Elm_Input_Panel_Lang lang)
129 Elm_Input_Panel_Lang elm_entry_input_panel_language_get(Evas_Object *obj) 125 Elm_Input_Panel_Lang elm_entry_input_panel_language_get(Evas_Object *obj)
130 # TODO: void elm_entry_input_panel_imdata_set(Evas_Object *obj, const_void *data, int len) 126 # TODO: void elm_entry_input_panel_imdata_set(Evas_Object *obj, const void *data, int len)
131 # TODO: void elm_entry_input_panel_imdata_get(const_Evas_Object *obj, void *data, int *len) 127 # TODO: void elm_entry_input_panel_imdata_get(const Evas_Object *obj, void *data, int *len)
132 void elm_entry_input_panel_return_key_type_set(Evas_Object *obj, Elm_Input_Panel_Return_Key_Type return_key_type) 128 void elm_entry_input_panel_return_key_type_set(Evas_Object *obj, Elm_Input_Panel_Return_Key_Type return_key_type)
133 Elm_Input_Panel_Return_Key_Type elm_entry_input_panel_return_key_type_get(Evas_Object *obj) 129 Elm_Input_Panel_Return_Key_Type elm_entry_input_panel_return_key_type_get(Evas_Object *obj)
134 void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled) 130 void elm_entry_input_panel_return_key_disabled_set(Evas_Object *obj, Eina_Bool disabled)
135 Eina_Bool elm_entry_input_panel_return_key_disabled_get(Evas_Object *obj) 131 Eina_Bool elm_entry_input_panel_return_key_disabled_get(Evas_Object *obj)
136 void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool disabled) 132 void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool disabled)
137 Eina_Bool elm_entry_input_panel_show_on_demand_get(const_Evas_Object *obj) 133 Eina_Bool elm_entry_input_panel_show_on_demand_get(const Evas_Object *obj)
138 void elm_entry_input_panel_show_on_demand_set(Evas_Object *obj, Eina_Bool ondemand) 134 void elm_entry_input_panel_show_on_demand_set(Evas_Object *obj, Eina_Bool ondemand)
139 135
140 void elm_entry_imf_context_reset(Evas_Object *obj) 136 void elm_entry_imf_context_reset(Evas_Object *obj)
@@ -147,11 +143,11 @@ cdef extern from "Elementary.h":
147 Elm_Cnp_Mode elm_entry_cnp_mode_get(Evas_Object *obj) 143 Elm_Cnp_Mode elm_entry_cnp_mode_get(Evas_Object *obj)
148 void elm_entry_anchor_hover_parent_set(Evas_Object *obj, Evas_Object *anchor_hover_parent) 144 void elm_entry_anchor_hover_parent_set(Evas_Object *obj, Evas_Object *anchor_hover_parent)
149 Evas_Object * elm_entry_anchor_hover_parent_get(Evas_Object *obj) 145 Evas_Object * elm_entry_anchor_hover_parent_get(Evas_Object *obj)
150 void elm_entry_anchor_hover_style_set(Evas_Object *obj, const_char *anchor_hover_style) 146 void elm_entry_anchor_hover_style_set(Evas_Object *obj, const char *anchor_hover_style)
151 const_char * elm_entry_anchor_hover_style_get(Evas_Object *obj) 147 const char * elm_entry_anchor_hover_style_get(Evas_Object *obj)
152 void elm_entry_anchor_hover_end(Evas_Object *obj) 148 void elm_entry_anchor_hover_end(Evas_Object *obj)
153 149
154 const_char * elm_entry_context_menu_item_label_get(const_Elm_Entry_Context_Menu_Item *item) 150 const char * elm_entry_context_menu_item_label_get(const Elm_Entry_Context_Menu_Item *item)
155 void elm_entry_context_menu_item_icon_get(const_Elm_Entry_Context_Menu_Item *item, const_char **icon_file, const_char **icon_group, Elm_Icon_Type *icon_type) 151 void elm_entry_context_menu_item_icon_get(const Elm_Entry_Context_Menu_Item *item, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type)
156 152
157 Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata) 153 Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata)
diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx
index 7e975d9..61ac603 100644
--- a/efl/elementary/entry.pyx
+++ b/efl/elementary/entry.pyx
@@ -552,24 +552,24 @@ def Entry_markup_to_utf8(string):
552 """Entry_markup_to_utf8(string)""" 552 """Entry_markup_to_utf8(string)"""
553 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 553 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
554 return _touni(elm_entry_markup_to_utf8( 554 return _touni(elm_entry_markup_to_utf8(
555 <const_char *>string if string is not None else NULL)) 555 <const char *>string if string is not None else NULL))
556 556
557@DEPRECATED("1.8", "Use utf8_to_markup() instead.") 557@DEPRECATED("1.8", "Use utf8_to_markup() instead.")
558def Entry_utf8_to_markup(string): 558def Entry_utf8_to_markup(string):
559 """Entry_utf8_to_markup(string)""" 559 """Entry_utf8_to_markup(string)"""
560 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 560 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
561 return _touni(elm_entry_utf8_to_markup( 561 return _touni(elm_entry_utf8_to_markup(
562 <const_char *>string if string is not None else NULL)) 562 <const char *>string if string is not None else NULL))
563 563
564def markup_to_utf8(string): 564def markup_to_utf8(string):
565 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 565 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
566 return _touni(elm_entry_markup_to_utf8( 566 return _touni(elm_entry_markup_to_utf8(
567 <const_char *>string if string is not None else NULL)) 567 <const char *>string if string is not None else NULL))
568 568
569def utf8_to_markup(string): 569def utf8_to_markup(string):
570 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 570 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
571 return _touni(elm_entry_utf8_to_markup( 571 return _touni(elm_entry_utf8_to_markup(
572 <const_char *>string if string is not None else NULL)) 572 <const char *>string if string is not None else NULL))
573 573
574cdef class EntryContextMenuItem(object): 574cdef class EntryContextMenuItem(object):
575 """ 575 """
@@ -606,8 +606,8 @@ cdef class EntryContextMenuItem(object):
606 """ 606 """
607 def __get__(self): 607 def __get__(self):
608 cdef: 608 cdef:
609 const_char *icon_file 609 const char *icon_file
610 const_char *icon_group 610 const char *icon_group
611 Elm_Icon_Type icon_type 611 Elm_Icon_Type icon_type
612 elm_entry_context_menu_item_icon_get(self.item, 612 elm_entry_context_menu_item_icon_get(self.item,
613 &icon_file, 613 &icon_file,
@@ -822,7 +822,7 @@ cdef class Entry(LayoutClass):
822 """ 822 """
823 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style) 823 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style)
824 elm_entry_text_style_user_push(self.obj, 824 elm_entry_text_style_user_push(self.obj,
825 <const_char *>style if style is not None else NULL) 825 <const char *>style if style is not None else NULL)
826 826
827 def text_style_user_pop(self): 827 def text_style_user_pop(self):
828 """text_style_user_pop() 828 """text_style_user_pop()
@@ -909,12 +909,12 @@ cdef class Entry(LayoutClass):
909 def __set__(self, entry): 909 def __set__(self, entry):
910 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry) 910 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry)
911 elm_entry_entry_set(self.obj, 911 elm_entry_entry_set(self.obj,
912 <const_char *>entry if entry is not None else NULL) 912 <const char *>entry if entry is not None else NULL)
913 913
914 def entry_set(self, entry): 914 def entry_set(self, entry):
915 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry) 915 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry)
916 elm_entry_entry_set(self.obj, 916 elm_entry_entry_set(self.obj,
917 <const_char *>entry if entry is not None else NULL) 917 <const char *>entry if entry is not None else NULL)
918 def entry_get(self): 918 def entry_get(self):
919 return _ctouni(elm_entry_entry_get(self.obj)) 919 return _ctouni(elm_entry_entry_get(self.obj))
920 920
@@ -935,7 +935,7 @@ cdef class Entry(LayoutClass):
935 """ 935 """
936 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text) 936 if isinstance(text, unicode): text = PyUnicode_AsUTF8String(text)
937 elm_entry_entry_append(self.obj, 937 elm_entry_entry_append(self.obj,
938 <const_char *>text if text is not None else NULL) 938 <const char *>text if text is not None else NULL)
939 939
940 property is_empty: 940 property is_empty:
941 """Gets whether the entry is empty. 941 """Gets whether the entry is empty.
@@ -978,7 +978,7 @@ cdef class Entry(LayoutClass):
978 done to the textblock returned by this function should be followed by 978 done to the textblock returned by this function should be followed by
979 a call to :py:func:`calc_force()`. 979 a call to :py:func:`calc_force()`.
980 980
981 The return value is marked as const_as an additional warning. 981 The return value is marked as const as an additional warning.
982 One should not use the returned object with any of the generic evas 982 One should not use the returned object with any of the generic evas
983 functions (geometry_get/resize/move and etc), but only with the textblock 983 functions (geometry_get/resize/move and etc), but only with the textblock
984 functions; The former will either not work at all, or break the correct 984 functions; The former will either not work at all, or break the correct
@@ -1035,7 +1035,7 @@ cdef class Entry(LayoutClass):
1035 """ 1035 """
1036 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry) 1036 if isinstance(entry, unicode): entry = PyUnicode_AsUTF8String(entry)
1037 elm_entry_entry_insert(self.obj, 1037 elm_entry_entry_insert(self.obj,
1038 <const_char *>entry if entry is not None else NULL) 1038 <const char *>entry if entry is not None else NULL)
1039 1039
1040 property line_wrap: 1040 property line_wrap:
1041 """The line wrap type to use on multi-line entries. 1041 """The line wrap type to use on multi-line entries.
@@ -1245,7 +1245,7 @@ cdef class Entry(LayoutClass):
1245 1245
1246 """ 1246 """
1247 cdef: 1247 cdef:
1248 const_char *text = elm_entry_cursor_content_get(self.obj) 1248 const char *text = elm_entry_cursor_content_get(self.obj)
1249 unicode ret = _ctouni(text) 1249 unicode ret = _ctouni(text)
1250 1250
1251 free(<void *>text) 1251 free(<void *>text)
@@ -1358,8 +1358,8 @@ cdef class Entry(LayoutClass):
1358 if isinstance(icon_file, unicode): icon_file = PyUnicode_AsUTF8String(icon_file) 1358 if isinstance(icon_file, unicode): icon_file = PyUnicode_AsUTF8String(icon_file)
1359 1359
1360 elm_entry_context_menu_item_add(self.obj, 1360 elm_entry_context_menu_item_add(self.obj,
1361 <const_char *>label if label is not None else NULL, 1361 <const char *>label if label is not None else NULL,
1362 <const_char *>icon_file if icon_file is not None else NULL, 1362 <const char *>icon_file if icon_file is not None else NULL,
1363 icon_type, 1363 icon_type,
1364 cb, 1364 cb,
1365 <void *>data if func is not None else NULL) 1365 <void *>data if func is not None else NULL)
@@ -1495,14 +1495,14 @@ cdef class Entry(LayoutClass):
1495 """markup_to_utf8(string)""" 1495 """markup_to_utf8(string)"""
1496 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 1496 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
1497 return _touni(elm_entry_markup_to_utf8( 1497 return _touni(elm_entry_markup_to_utf8(
1498 <const_char *>string if string is not None else NULL)) 1498 <const char *>string if string is not None else NULL))
1499 1499
1500 @DEPRECATED("1.8", "Use the module level utf8_to_markup() method instead.") 1500 @DEPRECATED("1.8", "Use the module level utf8_to_markup() method instead.")
1501 def utf8_to_markup(self, string): 1501 def utf8_to_markup(self, string):
1502 """utf8_to_markup(string)""" 1502 """utf8_to_markup(string)"""
1503 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string) 1503 if isinstance(string, unicode): string = PyUnicode_AsUTF8String(string)
1504 return _touni(elm_entry_utf8_to_markup( 1504 return _touni(elm_entry_utf8_to_markup(
1505 <const_char *>string if string is not None else NULL)) 1505 <const char *>string if string is not None else NULL))
1506 1506
1507 property file: 1507 property file:
1508 """The file for the text to display and then edit. 1508 """The file for the text to display and then edit.
@@ -1523,7 +1523,7 @@ cdef class Entry(LayoutClass):
1523 1523
1524 """ 1524 """
1525 def __get__(self): 1525 def __get__(self):
1526 cdef const_char *file 1526 cdef const char *file
1527 cdef Elm_Text_Format format 1527 cdef Elm_Text_Format format
1528 elm_entry_file_get(self.obj, &file, &format) 1528 elm_entry_file_get(self.obj, &file, &format)
1529 return (_ctouni(file), format) 1529 return (_ctouni(file), format)
@@ -1534,7 +1534,7 @@ cdef class Entry(LayoutClass):
1534 a2 = file_format 1534 a2 = file_format
1535 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) 1535 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1)
1536 if not elm_entry_file_set(self.obj, 1536 if not elm_entry_file_set(self.obj,
1537 <const_char *>a1 if a1 is not None else NULL, 1537 <const char *>a1 if a1 is not None else NULL,
1538 a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8): 1538 a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8):
1539 raise RuntimeError("Could not set file") 1539 raise RuntimeError("Could not set file")
1540 1540
@@ -1543,11 +1543,11 @@ cdef class Entry(LayoutClass):
1543 a2 = file_format 1543 a2 = file_format
1544 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1) 1544 if isinstance(a1, unicode): a1 = PyUnicode_AsUTF8String(a1)
1545 if not elm_entry_file_set(self.obj, 1545 if not elm_entry_file_set(self.obj,
1546 <const_char *>a1 if a1 is not None else NULL, 1546 <const char *>a1 if a1 is not None else NULL,
1547 a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8): 1547 a2 if a2 is not None else enums.ELM_TEXT_FORMAT_PLAIN_UTF8):
1548 raise RuntimeError("Could not set file") 1548 raise RuntimeError("Could not set file")
1549 def file_get(self): 1549 def file_get(self):
1550 cdef const_char *file 1550 cdef const char *file
1551 cdef Elm_Text_Format format 1551 cdef Elm_Text_Format format
1552 elm_entry_file_get(self.obj, &file, &format) 1552 elm_entry_file_get(self.obj, &file, &format)
1553 return (_ctouni(file), format) 1553 return (_ctouni(file), format)
@@ -1779,7 +1779,7 @@ cdef class Entry(LayoutClass):
1779 # :param len: the length of data, in bytes, to send to the input panel 1779 # :param len: the length of data, in bytes, to send to the input panel
1780 1780
1781 # """ 1781 # """
1782 # elm_entry_input_panel_imdata_set(self.obj, const_void *data, int len) 1782 # elm_entry_input_panel_imdata_set(self.obj, const void *data, int len)
1783 1783
1784 # TODO: 1784 # TODO:
1785 # def input_panel_imdata_get(self, data, length): 1785 # def input_panel_imdata_get(self, data, length):
@@ -2012,12 +2012,12 @@ cdef class Entry(LayoutClass):
2012 def __set__(self, style): 2012 def __set__(self, style):
2013 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style) 2013 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style)
2014 elm_entry_anchor_hover_style_set(self.obj, 2014 elm_entry_anchor_hover_style_set(self.obj,
2015 <const_char *>style if style is not None else NULL) 2015 <const char *>style if style is not None else NULL)
2016 2016
2017 def anchor_hover_style_set(self, style): 2017 def anchor_hover_style_set(self, style):
2018 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style) 2018 if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style)
2019 elm_entry_anchor_hover_style_set(self.obj, 2019 elm_entry_anchor_hover_style_set(self.obj,
2020 <const_char *>style if style is not None else NULL) 2020 <const char *>style if style is not None else NULL)
2021 def anchor_hover_style_get(self): 2021 def anchor_hover_style_get(self):
2022 return _ctouni(elm_entry_anchor_hover_style_get(self.obj)) 2022 return _ctouni(elm_entry_anchor_hover_style_get(self.obj))
2023 2023
diff --git a/efl/elementary/fileselector.pxd b/efl/elementary/fileselector.pxd
index 30bc290..d5fe5ab 100644
--- a/efl/elementary/fileselector.pxd
+++ b/efl/elementary/fileselector.pxd
@@ -1,35 +1,34 @@
1from efl.eina cimport Eina_Bool, const_Eina_List 1from efl.eina cimport Eina_Bool, Eina_List
2from efl.evas cimport Evas_Object, const_Evas_Object, Evas_Coord 2from efl.evas cimport Evas_Object, Evas_Coord
3from enums cimport Elm_Fileselector_Mode, Elm_Fileselector_Sort 3from enums cimport Elm_Fileselector_Mode, Elm_Fileselector_Sort
4from libc.string cimport const_char
5 4
6cdef extern from "Elementary.h": 5cdef extern from "Elementary.h":
7 ctypedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const_char *path, Eina_Bool dir, void *data) 6 ctypedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const char *path, Eina_Bool dir, void *data)
8 7
9 Evas_Object * elm_fileselector_add(Evas_Object *parent) 8 Evas_Object * elm_fileselector_add(Evas_Object *parent)
10 void elm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save) 9 void elm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save)
11 Eina_Bool elm_fileselector_is_save_get(const_Evas_Object *obj) 10 Eina_Bool elm_fileselector_is_save_get(const Evas_Object *obj)
12 void elm_fileselector_folder_only_set(Evas_Object *obj, Eina_Bool value) 11 void elm_fileselector_folder_only_set(Evas_Object *obj, Eina_Bool value)
13 Eina_Bool elm_fileselector_folder_only_get(const_Evas_Object *obj) 12 Eina_Bool elm_fileselector_folder_only_get(const Evas_Object *obj)
14 void elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj, Eina_Bool value) 13 void elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj, Eina_Bool value)
15 Eina_Bool elm_fileselector_buttons_ok_cancel_get(const_Evas_Object *obj) 14 Eina_Bool elm_fileselector_buttons_ok_cancel_get(const Evas_Object *obj)
16 void elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool value) 15 void elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool value)
17 Eina_Bool elm_fileselector_expandable_get(const_Evas_Object *obj) 16 Eina_Bool elm_fileselector_expandable_get(const Evas_Object *obj)
18 void elm_fileselector_path_set(Evas_Object *obj, const_char *path) 17 void elm_fileselector_path_set(Evas_Object *obj, const char *path)
19 const_char * elm_fileselector_path_get(const_Evas_Object *obj) 18 const char * elm_fileselector_path_get(const Evas_Object *obj)
20 void elm_fileselector_mode_set(Evas_Object *obj, Elm_Fileselector_Mode mode) 19 void elm_fileselector_mode_set(Evas_Object *obj, Elm_Fileselector_Mode mode)
21 Elm_Fileselector_Mode elm_fileselector_mode_get(const_Evas_Object *obj) 20 Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj)
22 void elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi) 21 void elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi)
23 Eina_Bool elm_fileselector_multi_select_get(const_Evas_Object *obj) 22 Eina_Bool elm_fileselector_multi_select_get(const Evas_Object *obj)
24 Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const_char *path) 23 Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const char *path)
25 const_char * elm_fileselector_selected_get(const_Evas_Object *obj) 24 const char * elm_fileselector_selected_get(const Evas_Object *obj)
26 const_Eina_List * elm_fileselector_selected_paths_get(const_Evas_Object *obj) 25 const Eina_List * elm_fileselector_selected_paths_get(const Evas_Object *obj)
27 Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object *obj, const_char *mime_types, const_char *filter_name) 26 Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_types, const char *filter_name)
28 Eina_Bool elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const_char *filter_name) 27 Eina_Bool elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name)
29 void elm_fileselector_filters_clear(Evas_Object *obj) 28 void elm_fileselector_filters_clear(Evas_Object *obj)
30 void elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible) 29 void elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible)
31 Eina_Bool elm_fileselector_hidden_visible_get(const_Evas_Object *obj) 30 Eina_Bool elm_fileselector_hidden_visible_get(const Evas_Object *obj)
32 Elm_Fileselector_Sort elm_fileselector_sort_method_get(const_Evas_Object *obj) 31 Elm_Fileselector_Sort elm_fileselector_sort_method_get(const Evas_Object *obj)
33 void elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort method) 32 void elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort method)
34 void elm_fileselector_thumbnail_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 33 void elm_fileselector_thumbnail_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
35 void elm_fileselector_thumbnail_size_get(const_Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 34 void elm_fileselector_thumbnail_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx
index 0ad9a2e..1c7246b 100644
--- a/efl/elementary/fileselector.pyx
+++ b/efl/elementary/fileselector.pyx
@@ -164,10 +164,10 @@ ELM_FILESELECTOR_SORT_BY_MODIFIED_DESC = enums.ELM_FILESELECTOR_SORT_BY_MODIFIED
164ELM_FILESELECTOR_SORT_LAST = enums.ELM_FILESELECTOR_SORT_LAST 164ELM_FILESELECTOR_SORT_LAST = enums.ELM_FILESELECTOR_SORT_LAST
165 165
166def _cb_string_conv(uintptr_t addr): 166def _cb_string_conv(uintptr_t addr):
167 cdef const_char *s = <const_char *>addr 167 cdef const char *s = <const char *>addr
168 return _ctouni(s) if s is not NULL else None 168 return _ctouni(s) if s is not NULL else None
169 169
170cdef Eina_Bool py_elm_fileselector_custom_filter_cb(const_char *path, Eina_Bool is_dir, void *data) with gil: 170cdef Eina_Bool py_elm_fileselector_custom_filter_cb(const char *path, Eina_Bool is_dir, void *data) with gil:
171 cb_func, cb_data = <object>data 171 cb_func, cb_data = <object>data
172 try: 172 try:
173 return cb_func(_ctouni(path), is_dir, cb_data) 173 return cb_func(_ctouni(path), is_dir, cb_data)
@@ -290,12 +290,12 @@ cdef class Fileselector(LayoutClass):
290 def __set__(self, path): 290 def __set__(self, path):
291 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path) 291 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path)
292 elm_fileselector_path_set(self.obj, 292 elm_fileselector_path_set(self.obj,
293 <const_char *>path if path is not None else NULL) 293 <const char *>path if path is not None else NULL)
294 294
295 def path_set(self, path): 295 def path_set(self, path):
296 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path) 296 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path)
297 elm_fileselector_path_set(self.obj, 297 elm_fileselector_path_set(self.obj,
298 <const_char *>path if path is not None else NULL) 298 <const char *>path if path is not None else NULL)
299 def path_get(self): 299 def path_get(self):
300 return _ctouni(elm_fileselector_path_get(self.obj)) 300 return _ctouni(elm_fileselector_path_get(self.obj))
301 301
@@ -385,13 +385,13 @@ cdef class Fileselector(LayoutClass):
385 def __set__(self, path): 385 def __set__(self, path):
386 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path) 386 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path)
387 if not elm_fileselector_selected_set(self.obj, 387 if not elm_fileselector_selected_set(self.obj,
388 <const_char *>path if path is not None else NULL): 388 <const char *>path if path is not None else NULL):
389 raise RuntimeError("Setting the selected path failed") 389 raise RuntimeError("Setting the selected path failed")
390 390
391 def selected_set(self, path): 391 def selected_set(self, path):
392 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path) 392 if isinstance(path, unicode): path = PyUnicode_AsUTF8String(path)
393 if not elm_fileselector_selected_set(self.obj, 393 if not elm_fileselector_selected_set(self.obj,
394 <const_char *>path if path is not None else NULL): 394 <const char *>path if path is not None else NULL):
395 raise RuntimeError("Setting the selected path failed") 395 raise RuntimeError("Setting the selected path failed")
396 def selected_get(self): 396 def selected_get(self):
397 return _ctouni(elm_fileselector_selected_get(self.obj)) 397 return _ctouni(elm_fileselector_selected_get(self.obj))
@@ -446,7 +446,7 @@ cdef class Fileselector(LayoutClass):
446 if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types_s) 446 if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types_s)
447 if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name) 447 if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name)
448 if not elm_fileselector_mime_types_filter_append(self.obj, mime_types_s, 448 if not elm_fileselector_mime_types_filter_append(self.obj, mime_types_s,
449 <const_char *>filter_name if filter_name is not None else NULL): 449 <const char *>filter_name if filter_name is not None else NULL):
450 raise RuntimeWarning 450 raise RuntimeWarning
451 451
452 def custom_filter_append(self, func, data=None, filter_name=None): 452 def custom_filter_append(self, func, data=None, filter_name=None):
@@ -477,7 +477,7 @@ cdef class Fileselector(LayoutClass):
477 if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name) 477 if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name)
478 elm_fileselector_custom_filter_append(self.obj, 478 elm_fileselector_custom_filter_append(self.obj,
479 py_elm_fileselector_custom_filter_cb, <void *>cb_data, 479 py_elm_fileselector_custom_filter_cb, <void *>cb_data,
480 <const_char *>filter_name if filter_name is not None else NULL) 480 <const char *>filter_name if filter_name is not None else NULL)
481 481
482 def filters_clear(self): 482 def filters_clear(self):
483 """ 483 """
diff --git a/efl/elementary/fileselector_button.pxd b/efl/elementary/fileselector_button.pxd
index 6506f7c..b9805f1 100644
--- a/efl/elementary/fileselector_button.pxd
+++ b/efl/elementary/fileselector_button.pxd
@@ -1,10 +1,9 @@
1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord 1from efl.evas cimport Eina_Bool, Evas_Object, Evas_Coord
2from libc.string cimport const_char
3 2
4cdef extern from "Elementary.h": 3cdef extern from "Elementary.h":
5 Evas_Object * elm_fileselector_button_add(Evas_Object *parent) 4 Evas_Object * elm_fileselector_button_add(Evas_Object *parent)
6 void elm_fileselector_button_window_title_set(Evas_Object *obj, const_char *title)