Menu
▾
▴
E SVN: barbieri trunk/BINDINGS/python/python-elementary/elementary
|
From: Enlightenment S. <no-...@en...> - 2009-12-24 00:06:20
|
Log:
rename _callback_remove() and all *_remove() to _del()
This also uses the new framework to convert from C pointers to Python
objects, removing hacks from file selector, anchorblock, anchorview
and others.
Author: barbieri
Date: 2009-12-23 16:06:13 -0800 (Wed, 23 Dec 2009)
New Revision: 44710
Modified:
trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorblock.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorview.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_entry.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_fileselector.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hover.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hoversel.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_icon.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_image.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_list.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_photo.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_radio.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_slider.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_spinner.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toggle.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toolbar.pxi trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_window.pxi
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorblock.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorblock.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorblock.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -28,31 +28,20 @@
self.hover_top = False
self.hover_bottom = False
-cdef void _anchorblock_callback(void *cbtl, c_evas.Evas_Object *o, void *event_info) with gil:
- cdef Elm_Entry_Anchorblock_Info *ei
- l = <object>cbtl
- for cbt in l:
- try:
- obj, callback, a, ka = cbt
- if event_info is NULL:
- ab = None
- else:
- ei = <Elm_Entry_Anchorblock_Info*>event_info
- ab = AnchorBlockInfo()
- ab.name = ei.name
- ab.button = ei.button
- ab.hover = Hover(None, <object>ei.hover);
- ab.anchor = (ei.anchor.x, ei.anchor.y,
- ei.anchor.w, ei.anchor.h)
- ab.hover_parent = (ei.hover_parent.x, ei.hover_parent.y,
- ei.hover_parent.w, ei.hover_parent.h)
- ab.hover_left = ei.hover_left
- ab.hover_right = ei.hover_right
- ab.hover_top = ei.hover_top
- ab.hover_bottom = ei.hover_bottom
- callback(obj, ab, *a, **ka)
- except Exception, e:
- traceback.print_exc()
+def _anchorblock_conv(long addr):
+ cdef Elm_Entry_Anchorblock_Info *ei = <Elm_Entry_Anchorblock_Info *>addr
+ ab = AnchorBlockInfo()
+ ab.name = ei.name
+ ab.button = ei.button
+ ab.hover = Hover(None, <object>ei.hover);
+ ab.anchor = (ei.anchor.x, ei.anchor.y, ei.anchor.w, ei.anchor.h)
+ ab.hover_parent = (ei.hover_parent.x, ei.hover_parent.y,
+ ei.hover_parent.w, ei.hover_parent.h)
+ ab.hover_left = ei.hover_left
+ ab.hover_right = ei.hover_right
+ ab.hover_top = ei.hover_top
+ ab.hover_bottom = ei.hover_bottom
+ return ab
cdef class AnchorBlock(Object):
"""
@@ -78,7 +67,7 @@
self._set_obj(elm_anchorblock_add(parent.obj))
self._cbs = {}
- def callback_clicked_add(self, func, *args, **kwargs):
+ def callback_clicked_add(self, func, *args, **kargs):
""" Bound to signal "anchor, clicked"
The callback should have the following signature:
@@ -89,39 +78,13 @@
The value set is either the callback function or a tuple like
(callback, *args, **kwargs)
"""
- cdef object cbt
+ return self._callback_add_full("anchor,clicked", _anchorblock_conv,
+ func, *args, **kargs)
- if not callable(func):
- raise TypeError("callback is not callable")
+ def callback_clicked_del(self, func):
+ return self._callback_del_full("anchor,clicked", _anchorblock_conv,
+ func)
- event = "anchor,clicked"
-
- cbt = (self, func, args, kwargs)
-
- if self._cbs.has_key(event):
- self._cbs[event].append(cbt)
- else:
- self._cbs[event] = [cbt]
- # register callback
- c_evas.evas_object_smart_callback_add(self.obj, event,
- _anchorblock_callback,
- <void *>self._cbs[event])
-
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- event = "anchor,clicked"
- if self._cbs and self._cbs.has_keys(event):
- if func is None:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _anchorblock_callback)
- self._cbs[event] = None
- else:
- for i, cbt in enumerate(self._cbs[event]):
- if cbt is not None and (self, func, args, kwargs) == <object>cbt:
- self._cbs[event][i] = None
- if not self._cbs[event]:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _anchorblock_callback)
-
def text_set(self, text):
"""
Set the text markup of the anchorblock
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorview.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorview.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_anchorview.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -28,31 +28,20 @@
self.hover_top = False
self.hover_bottom = False
-cdef void _anchorview_callback(void *cbtl, c_evas.Evas_Object *o, void *event_info) with gil:
- cdef Elm_Entry_Anchorview_Info *ei
- l = <object>cbtl
- for cbt in l:
- try:
- obj, callback, args, kwargs = cbt
- if event_info is NULL:
- av = None
- else:
- ei = <Elm_Entry_Anchorview_Info*>event_info
- av = AnchorViewInfo()
- av.name = ei.name
- av.button = ei.button
- av.hover = Hover(None, <object>ei.hover);
- av.anchor = (ei.anchor.x, ei.anchor.y,
- ei.anchor.w, ei.anchor.h)
- av.hover_parent = (ei.hover_parent.x, ei.hover_parent.y,
- ei.hover_parent.w, ei.hover_parent.h)
- av.hover_left = ei.hover_left
- av.hover_right = ei.hover_right
- av.hover_top = ei.hover_top
- av.hover_bottom = ei.hover_bottom
- callback(obj, av, *args, **kwargs)
- except Exception, e:
- traceback.print_exc()
+def _anchorview_conv(long addr):
+ cdef Elm_Entry_Anchorview_Info *ei = <Elm_Entry_Anchorview_Info *>addr
+ av = AnchorViewInfo()
+ av.name = ei.name
+ av.button = ei.button
+ av.hover = Hover(None, <object>ei.hover);
+ av.anchor = (ei.anchor.x, ei.anchor.y, ei.anchor.w, ei.anchor.h)
+ av.hover_parent = (ei.hover_parent.x, ei.hover_parent.y,
+ ei.hover_parent.w, ei.hover_parent.h)
+ av.hover_left = ei.hover_left
+ av.hover_right = ei.hover_right
+ av.hover_top = ei.hover_top
+ av.hover_bottom = ei.hover_bottom
+ return av
cdef class AnchorView(Object):
"""
@@ -76,7 +65,7 @@
self._set_obj(elm_anchorview_add(parent.obj))
self._cbs = {}
- def callback_clicked_add(self, func, *args, **kwargs):
+ def callback_clicked_add(self, func, *args, **kargs):
""" Bound to signal "anchor, clicked"
The callback should have the following signature:
@@ -87,39 +76,12 @@
The value set is either the callback function or a tuple like
(callback, *args, **kargs)
"""
- cdef object cbt
+ return self._callback_add_full("anchor,clicked", _anchorview_conv,
+ func, *args, **kargs)
- if not callable(func):
- raise TypeError("callback is not callable")
+ def callback_clicked_del(self, func):
+ return self._callback_del_full("anchor,clicked", _anchorview_conv, func)
- event = "anchor,clicked"
-
- cbt = (self, func, args, kwargs)
-
- if self._cbs.has_key(event):
- self._cbs[event].append(cbt)
- else:
- self._cbs[event] = [cbt]
- # register callback
- c_evas.evas_object_smart_callback_add(self.obj, event,
- _anchorview_callback,
- <void *>self._cbs[event])
-
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- event = "anchor,clicked"
- if self._cbs and self._cbs.has_keys(event):
- if func is None:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _anchorview_callback)
- self._cbs[event] = None
- else:
- for i, cbt in enumerate(self._cbs[event]):
- if cbt is not None and (self, func, args, kwargs) == <object>cbt:
- self._cbs[event][i] = None
- if not self._cbs[event]:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _anchorview_callback)
-
def text_set(self, text):
"""
Set the text markup of the anchorview
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_button.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -24,8 +24,8 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
def label_set(self, label):
elm_button_label_set(self.obj, label)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_check.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -77,6 +77,6 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_entry.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_entry.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_entry.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -39,87 +39,75 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
-
def callback_selection_start_add(self, func, *args, **kwargs):
self._callback_add("selection,start", func, *args, **kwargs)
- def callback_selection_start_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,start", func, *args, **kwargs)
+ def callback_selection_start_del(self, func):
+ self._callback_del("selection,start", func)
-
def callback_selection_changed_add(self, func, *args, **kwargs):
self._callback_add("selection,changed", func, *args, **kwargs)
- def callback_selection_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,changed", func, *args, **kwargs)
+ def callback_selection_changed_del(self, func):
+ self._callback_del("selection,changed", func)
-
def callback_selection_cleared_add(self, func, *args, **kwargs):
self._callback_add("selection,cleared", func, *args, **kwargs)
- def callback_selection_cleared_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,cleared", func, *args, **kwargs)
+ def callback_selection_cleared_del(self, func):
+ self._callback_del("selection,cleared", func)
-
def callback_selection_paste_add(self, func, *args, **kwargs):
self._callback_add("selection,paste", func, *args, **kwargs)
- def callback_selection_paste_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,paste", func, *args, **kwargs)
+ def callback_selection_paste_del(self, func):
+ self._callback_del("selection,paste", func)
-
def callback_selection_copy_add(self, func, *args, **kwargs):
self._callback_add("selection,copy", func, *args, **kwargs)
- def callback_selection_copy_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,copy", func, *args, **kwargs)
+ def callback_selection_copy_del(self, func):
+ self._callback_del("selection,copy", func)
-
def callback_selection_cut_add(self, func, *args, **kwargs):
self._callback_add("selection,cut", func, *args, **kwargs)
- def callback_selection_cut_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selection,cut", func, *args, **kwargs)
+ def callback_selection_cut_del(self, func):
+ self._callback_del("selection,cut", func)
-
def callback_cursor_changed_add(self, func, *args, **kwargs):
self._callback_add("cursor,changed", func, *args, **kwargs)
- def callback_cursor_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("cursor,changed", func, *args, **kwargs)
+ def callback_cursor_changed_del(self, func):
+ self._callback_del("cursor,changed", func)
-
def callback_anchor_clicked_add(self, func, *args, **kwargs):
self._callback_add("anchor,clicked", func, *args, **kwargs)
- def callback_anchor_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("anchor,clicked", func, *args, **kwargs)
+ def callback_anchor_clicked_del(self, func):
+ self._callback_del("anchor,clicked", func)
-
def callback_activated_add(self, func, *args, **kwargs):
self._callback_add("activated", func, *args, **kwargs)
- def callback_activated_remove(self, func = None, *args, **kwargs):
- self._callback_remove("activated", func, *args, **kwargs)
+ def callback_activated_del(self, func):
+ self._callback_del("activated", func)
-
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
-
def callback_double_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked,double", func, *args, **kwargs)
- def callback_double_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked,double", func, *args, **kwargs)
+ def callback_double_clicked_del(self, func):
+ self._callback_del("clicked,double", func)
-
def single_line_set(self, single_line):
elm_entry_single_line_set(self.obj, single_line)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_fileselector.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_fileselector.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_fileselector.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -16,17 +16,12 @@
# along with python-elementary. If not, see <http://www.gnu.org/licenses/>.
#
-cdef void _fs_callback(void *cbtl, c_evas.Evas_Object *obj, void *event_info) with gil:
- l = <object>cbtl
- for cbt in l:
- try:
- fs, func, args, kwargs = cbt
- selected = None
- if event_info != NULL:
- selected = <char*>event_info
- func(fs, selected, *args, **kwargs)
- except Exception, e:
- traceback.print_exc()
+def _fs_callback_conv(long addr):
+ cdef char *str = <char *>addr
+ if str == NULL:
+ return None
+ else:
+ return str
cdef class Fileselector(Object):
cdef object _cbs
@@ -62,46 +57,17 @@
def is_save_set(self, is_save):
elm_fileselector_is_save_set(self.obj, is_save)
- def _fs_callback_add(self, event, func, *args, **kwargs):
- cdef object cbt
-
- if not callable(func):
- raise TypeError("callback is not callable")
-
- cbt = (self, func, args, kwargs)
-
- if self._cbs.has_key(event):
- self._cbs[event].append(cbt)
- else:
- self._cbs[event] = [cbt]
- # register callback
- c_evas.evas_object_smart_callback_add(self.obj, event,
- _fs_callback,
- <void *>self._cbs[event])
-
- def _fs_callback_remove(self, event, func = None, *args, **kwargs):
- if self._cbs and self._cbs.has_key(event):
- if func is None:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _fs_callback)
- self._cbs[event] = None
- else:
- for i, cbt in enumerate(self._cbs[event]):
- if cbt is not None and (self, func, args, kwargs) == <object>cbt:
- self._cbs[event][i] = None
- if not self._cbs[event]:
- c_evas.evas_object_smart_callback_del(self.obj, event,
- _fs_callback)
-
def callback_selected_add(self, func, *args, **kwargs):
- self._fs_callback_add("selected", func, *args, **kwargs)
+ self._callback_add_full("selected", _fs_callback_conv,
+ func, *args, **kwargs)
- def callback_selected_remove(self, func = None, *args, **kwargs):
- self._fs_callback_remove("selected", func, *args, **kwargs)
+ def callback_selected_del(self, func):
+ self._callback_del_full("selected", _fs_callback_conv, func)
def callback_done_add(self, func, *args, **kwargs):
- self._fs_callback_add("done", func, *args, **kwargs)
+ self._callback_add_full("done", _fs_callback_conv,
+ func, *args, **kwargs)
- def callback_done_remove(self, func = None, *args, **kwargs):
- self._fs_callback_remove("done", func, *args, **kwargs)
+ def callback_done_del(self, func):
+ self._callback_del_full("done", _fs_callback_conv, func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hover.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hover.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hover.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -27,8 +27,8 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
def target_set(self, c_evas.Object target):
elm_hover_target_set(self.obj, target.obj)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hoversel.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hoversel.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_hoversel.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -94,22 +94,20 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
-
def callback_selected_add(self, func, *args, **kwargs):
self._callback_add("selected", func, *args, **kwargs)
- def callback_selected_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selected", func, *args, **kwargs)
+ def callback_selected_del(self, func):
+ self._callback_del("selected", func)
-
def callback_dismissed_add(self, func, *args, **kwargs):
self._callback_add("dismissed", func, *args, **kwargs)
- def callback_dismissed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("dismissed", func, *args, **kwargs)
+ def callback_dismissed_del(self, func):
+ self._callback_del("dismissed", func)
def hover_parent_set(self, c_evas.Object parent):
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_icon.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_icon.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_icon.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -45,8 +45,8 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
def standard_set(self,standard):
elm_icon_standard_set(self.obj,standard)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_image.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_image.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_image.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -45,5 +45,5 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_list.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_list.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_list.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -27,6 +27,15 @@
(obj, callback, it, a, ka) = <object>data
it.__del_cb()
+def _list_item_conv(long addr):
+ cdef Elm_List_Item *it = <Elm_List_Item *>addr
+ cdef void *data = elm_list_item_data_get(it)
+ if data == NULL:
+ return None
+ else:
+ cbt = <object>data
+ return cbt[0]
+
cdef enum Elm_List_Item_Insert_Kind:
ELM_LIST_ITEM_INSERT_APPEND
ELM_LIST_ITEM_INSERT_PREPEND
@@ -251,21 +260,29 @@
return ret
def callback_clicked_add(self, func, *args, **kwargs):
- self._callback_add("clicked", func, *args, **kwargs)
+ self._callback_add_full("clicked", _list_item_conv,
+ func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del_full("clicked", _list_item_conv, func)
-
def callback_selected_add(self, func, *args, **kwargs):
- self._callback_add("selected", func, *args, **kwargs)
+ self._callback_add_full("selected", _list_item_conv,
+ func, *args, **kwargs)
- def callback_selected_remove(self, func = None, *args, **kwargs):
- self._callback_remove("selected", func, *args, **kwargs)
+ def callback_selected_del(self, func):
+ self._callback_del_full("selected", _list_item_conv, func)
-
def callback_unselected_add(self, func, *args, **kwargs):
- self._callback_add("unselected", func, *args, **kwargs)
+ self._callback_add_full("unselected", _list_item_conv,
+ func, *args, **kwargs)
- def callback_unselected_remove(self, func = None, *args, **kwargs):
- self._callback_remove("unselected", func, *args, **kwargs)
+ def callback_unselected_del(self, func):
+ self._callback_del_full("unselected", _list_item_conv, func)
+
+ def callback_longpressed_add(self, func, *args, **kwargs):
+ self._callback_add_full("longpressed", _list_item_conv,
+ func, *args, **kwargs)
+
+ def callback_longpressed_del(self, func):
+ self._callback_del_full("longpressed", _list_item_conv, func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_photo.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_photo.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_photo.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -24,8 +24,8 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
def file_set(self, filename):
elm_photo_file_set(self.obj, filename)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_radio.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_radio.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_radio.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -42,5 +42,5 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_slider.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_slider.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_slider.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -46,15 +46,14 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
-
def callback_delay_changed_add(self, func, *args, **kwargs):
self._callback_add("delay,changed", func, *args, **kwargs)
- def callback_delay_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("delay,changed", func, *args, **kwargs)
+ def callback_delay_changed_del(self, func):
+ self._callback_del("delay,changed", func)
property value:
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_spinner.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_spinner.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_spinner.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -52,12 +52,11 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
-
def callback_delay_changed_add(self, func, *args, **kwargs):
self._callback_add("delay,changed", func, *args, **kwargs)
- def callback_delay_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("delay,changed", func, *args, **kwargs)
+ def callback_delay_changed_del(self, func):
+ self._callback_del("delay,changed", func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toggle.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toggle.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toggle.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -34,8 +34,8 @@
def callback_changed_add(self, func, *args, **kwargs):
self._callback_add("changed", func, *args, **kwargs)
- def callback_changed_remove(self, func = None, *args, **kwargs):
- self._callback_remove("changed", func, *args, **kwargs)
+ def callback_changed_del(self, func):
+ self._callback_del("changed", func)
def label_set(self, label):
elm_toggle_label_set(self.obj, label)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toolbar.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toolbar.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_toolbar.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -109,6 +109,6 @@
def callback_clicked_add(self, func, *args, **kwargs):
self._callback_add("clicked", func, *args, **kwargs)
- def callback_clicked_remove(self, func = None, *args, **kwargs):
- self._callback_remove("clicked", func, *args, **kwargs)
+ def callback_clicked_del(self, func):
+ self._callback_del("clicked", func)
Modified: trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_window.pxi
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_window.pxi 2009-12-23 23:26:04 UTC (rev 44709)
+++ trunk/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_window.pxi 2009-12-24 00:06:13 UTC (rev 44710)
@@ -44,22 +44,20 @@
def callback_destroy_add(self, func, *args, **kwargs):
self._callback_add("delete-request", func, *args, **kwargs)
- def callback_destroy_remove(self, func = None, *args, **kwargs):
- self._callback_remove("delete-request", func, *args, **kwargs)
+ def callback_destroy_del(self, func):
+ self._callback_del("delete-request", func)
-
def callback_focus_in_add(self, func, *args, **kwargs):
self._callback_add("focus-in", func, *args, **kwargs)
- def callback_focus_in_remove(self, func = None, *args, **kwargs):
- self._callback_remove("focus-in", func, *args, **kwargs)
+ def callback_focus_in_del(self, func):
+ self._callback_del("focus-in", func)
-
def callback_focus_out_add(self, func, *args, **kwargs):
self._callback_add("focus-out", func, *args, **kwargs)
- def callback_focus_out_remove(self, func = None, *args, **kwargs):
- self._callback_remove("focus-out", func, *args, **kwargs)
+ def callback_focus_out_del(self, func):
+ self._callback_del("focus-out")
def resize_object_add(self,c_evas.Object obj):
|