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

Elementary: Use the private internal_data dict instead of abusing user data dict

This commit is contained in:
Kai Huuhko 2016-01-23 15:55:49 +02:00
parent fa69908d71
commit 6980ffb0e4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
efl/elementary/cnp_callbacks.pxi
View File

@ -143,7 +143,7 @@ cdef Elm_Object_Item *py_elm_xy_item_get_cb(Evas_Object *obj, Evas_Coord x, Evas
ObjectItem it
try:
ret = o.data["xy_item_get_cb"](o, x, y)
ret = o.internal_data["xy_item_get_cb"](o, x, y)
it, xpos1, ypos1 = ret
except Exception:
traceback.print_exc()
@ -321,7 +321,7 @@ cdef void py_elm_drag_item_container_pos(
ObjectItem item = _object_item_to_python(it)
try:
o.data["drag_item_container_pos"](o, item, x, y, xposret, yposret, action, <object>data if data is not NULL else None)
o.internal_data["drag_item_container_pos"](o, item, x, y, xposret, yposret, action, <object>data if data is not NULL else None)
except Exception:
traceback.print_exc()
@ -352,7 +352,7 @@ cdef Eina_Bool py_elm_drop_item_container_cb(
evdata.sel_data = ev
cb = o.data["drop_item_container_cb"]
cb = o.internal_data["drop_item_container_cb"]
if data != NULL:
cbdata = <object>data
@ -434,7 +434,7 @@ cdef Eina_Bool py_elm_item_container_data_get_cb(
bint ret
try:
func = o.data["item_container_data_get_cb"]
func = o.internal_data["item_container_data_get_cb"]
ret = func(o, item, pyinfo)
except Exception:
traceback.print_exc()

10
efl/elementary/gengrid_widget.pxi
View File

@ -651,9 +651,9 @@ cdef class Gengrid(Object):
if itemgetcb is not None:
if not callable(itemgetcb):
raise TypeError("itemgetcb must be callable.")
self.data["xy_item_get_cb"] = itemgetcb
self.internal_data["xy_item_get_cb"] = itemgetcb
self.data["item_container_data_get_cb"] = data_get
self.internal_data["item_container_data_get_cb"] = data_get
if not elm_drag_item_container_add(self.obj,
tm_to_anim,
@ -702,10 +702,10 @@ cdef class Gengrid(Object):
if itemgetcb is not None:
if not callable(itemgetcb):
raise TypeError("itemgetcb must be callable.")
self.data["xy_item_get_cb"] = itemgetcb
self.internal_data["xy_item_get_cb"] = itemgetcb
self.data["drag_item_container_pos"] = poscb
self.data["drop_item_container_cb"] = dropcb
self.internal_data["drag_item_container_pos"] = poscb
self.internal_data["drop_item_container_cb"] = dropcb
if not elm_drop_item_container_add(self.obj,
format,

18
efl/elementary/genlist_widget.pxi
View File

@ -723,17 +723,17 @@ cdef class Genlist(Object):
"""
def __set__(self, object key):
self.data['__filterkeyref'] = key # keep a reference for key
self.internal_data['__filterkeyref'] = key # keep a reference for key
elm_genlist_filter_set(self.obj, <void *>key if key is not None else NULL)
def __get__(self):
return self.data['__filterkeyref']
return self.internal_data['__filterkeyref']
def filter_set(self, key):
self.data['__filterkeyref'] = key
self.internal_data['__filterkeyref'] = key
elm_genlist_filter_set(self.obj, <void*>key if key is not None else NULL)
def filter_get(self):
return self.data['__filterkeyref']
return self.internal_data['__filterkeyref']
#
# Drag and Drop
@ -757,9 +757,9 @@ cdef class Genlist(Object):
if itemgetcb is not None:
if not callable(itemgetcb):
raise TypeError("itemgetcb must be callable.")
self.data["xy_item_get_cb"] = itemgetcb
self.internal_data["xy_item_get_cb"] = itemgetcb
self.data["item_container_data_get_cb"] = data_get
self.internal_data["item_container_data_get_cb"] = data_get
if not elm_drag_item_container_add(self.obj,
tm_to_anim,
@ -808,10 +808,10 @@ cdef class Genlist(Object):
if itemgetcb is not None:
if not callable(itemgetcb):
raise TypeError("itemgetcb must be callable.")
self.data["xy_item_get_cb"] = itemgetcb
self.internal_data["xy_item_get_cb"] = itemgetcb
self.data["drag_item_container_pos"] = poscb
self.data["drop_item_container_cb"] = dropcb
self.internal_data["drag_item_container_pos"] = poscb
self.internal_data["drop_item_container_cb"] = dropcb
if not elm_drop_item_container_add(self.obj,
format,