-- Martin 'JaMa' Jansa jabber: [email protected]
From e7b271fa48365e740a889d45ec179876e49834d3 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 30 Jan 2012 15:10:03 +0100 Subject: [PATCH 1/2] python-elementary: s/Elm_Gengrid_Item /Elm_Object_Item /g
Signed-off-by: Martin Jansa <[email protected]> --- .../elementary/elementary.c_elementary_gengrid.pxi | 32 +++++----- .../include/elementary/c_elementary.pxd | 68 ++++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_gengrid.pxi b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_gengrid.pxi index 8b58168..2330a96 100644 --- a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_gengrid.pxi +++ b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_gengrid.pxi @@ -287,10 +287,10 @@ cdef class GengridItem(WidgetItem): """ An item for the gengrid widget """ - cdef Elm_Gengrid_Item *obj + cdef Elm_Object_Item *obj cdef object params - cdef int _set_obj(self, Elm_Gengrid_Item *obj, params) except 0: + cdef int _set_obj(self, Elm_Object_Item *obj, params) except 0: assert self.obj == NULL, "Object must be clean" self.obj = obj self.params = params @@ -323,7 +323,7 @@ cdef class GengridItem(WidgetItem): self.params[1]) def next_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it it = elm_gengrid_item_next_get(self.obj) return _elm_gengrid_item_to_python(it) @@ -332,7 +332,7 @@ cdef class GengridItem(WidgetItem): return self.next_get() def prev_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it it = elm_gengrid_item_prev_get(self.obj) return _elm_gengrid_item_to_python(it) @@ -516,7 +516,7 @@ cdef class GengridItem(WidgetItem): def _gengrid_item_conv(long addr): - cdef Elm_Gengrid_Item *it = <Elm_Gengrid_Item *>addr + cdef Elm_Object_Item *it = <Elm_Object_Item *>addr cdef void *data = elm_gengrid_item_data_get(it) if data == NULL: return None @@ -524,13 +524,13 @@ def _gengrid_item_conv(long addr): prm = <object>data return prm[2] -cdef Elm_Gengrid_Item *_elm_gengrid_item_from_python(GengridItem item): +cdef Elm_Object_Item *_elm_gengrid_item_from_python(GengridItem item): if item is None: return NULL else: return item.obj -cdef _elm_gengrid_item_to_python(Elm_Gengrid_Item *it): +cdef _elm_gengrid_item_to_python(Elm_Object_Item *it): cdef void *data cdef object prm if it == NULL: @@ -628,7 +628,7 @@ cdef class Gengrid(Object): value given as parameter to this function. """ cdef GengridItem ret = GengridItem() - cdef Elm_Gengrid_Item *item + cdef Elm_Object_Item *item cdef c_evas.Evas_Smart_Cb cb if func is None: @@ -668,7 +668,7 @@ cdef class Gengrid(Object): value given as parameter to this function. """ cdef GengridItem ret = GengridItem() - cdef Elm_Gengrid_Item *item + cdef Elm_Object_Item *item cdef c_evas.Evas_Smart_Cb cb if func is None: @@ -711,7 +711,7 @@ cdef class Gengrid(Object): value given as parameter to this function. """ cdef GengridItem ret = GengridItem() - cdef Elm_Gengrid_Item *item, *before + cdef Elm_Object_Item *item, *before cdef c_evas.Evas_Smart_Cb cb before = _elm_gengrid_item_from_python(before_item) @@ -757,7 +757,7 @@ cdef class Gengrid(Object): value given as parameter to this function. """ cdef GengridItem ret = GengridItem() - cdef Elm_Gengrid_Item *item, *after + cdef Elm_Object_Item *item, *after cdef c_evas.Evas_Smart_Cb cb after = _elm_gengrid_item_from_python(after_item) @@ -781,14 +781,14 @@ cdef class Gengrid(Object): return None def selected_items_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it cdef c_evas.const_Eina_List *lst lst = elm_gengrid_selected_items_get(self.obj) ret = [] ret_append = ret.append while lst: - it = <Elm_Gengrid_Item *>lst.data + it = <Elm_Object_Item *>lst.data lst = lst.next o = _elm_gengrid_item_to_python(it) if o is not None: @@ -796,7 +796,7 @@ cdef class Gengrid(Object): return ret def selected_item_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it it = elm_gengrid_selected_item_get(self.obj) return _elm_gengrid_item_to_python(it) @@ -805,7 +805,7 @@ cdef class Gengrid(Object): return self.selected_item_get() def first_item_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it it = elm_gengrid_first_item_get(self.obj) return _elm_gengrid_item_to_python(it) @@ -814,7 +814,7 @@ cdef class Gengrid(Object): return self.first_item_get() def last_item_get(self): - cdef Elm_Gengrid_Item *it + cdef Elm_Object_Item *it it = elm_gengrid_last_item_get(self.obj) return _elm_gengrid_item_to_python(it) diff --git a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd index f121e02..ba45eb7 100644 --- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd +++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd @@ -777,41 +777,41 @@ cdef extern from "Elementary.h": void elm_gengrid_page_size_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Evas_Coord h_pagesize, evas.c_evas.Evas_Coord v_pagesize) void elm_gengrid_horizontal_set(evas.c_evas.Evas_Object *obj, evas.c_evas.Eina_Bool setting) - Elm_Gengrid_Item *elm_gengrid_item_append(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, evas.c_evas.Evas_Smart_Cb func, void *func_data) - Elm_Gengrid_Item *elm_gengrid_item_prepend(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, evas.c_evas.Evas_Smart_Cb func, void *func_data) - Elm_Gengrid_Item *elm_gengrid_item_insert_before(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, Elm_Gengrid_Item *before, evas.c_evas.Evas_Smart_Cb func, void *func_data) - Elm_Gengrid_Item *elm_gengrid_item_insert_after(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, Elm_Gengrid_Item *after, evas.c_evas.Evas_Smart_Cb func, void *func_data) - Elm_Gengrid_Item *elm_gengrid_selected_item_get(evas.c_evas.Evas_Object *obj) + Elm_Object_Item *elm_gengrid_item_append(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, evas.c_evas.Evas_Smart_Cb func, void *func_data) + Elm_Object_Item *elm_gengrid_item_prepend(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, evas.c_evas.Evas_Smart_Cb func, void *func_data) + Elm_Object_Item *elm_gengrid_item_insert_before(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, Elm_Object_Item *before, evas.c_evas.Evas_Smart_Cb func, void *func_data) + Elm_Object_Item *elm_gengrid_item_insert_after(evas.c_evas.Evas_Object *obj, Elm_Gengrid_Item_Class *itc, void *data, Elm_Object_Item *after, evas.c_evas.Evas_Smart_Cb func, void *func_data) + Elm_Object_Item *elm_gengrid_selected_item_get(evas.c_evas.Evas_Object *obj) evas.c_evas.Eina_List *elm_gengrid_selected_items_get(evas.c_evas.Evas_Object *obj) - Elm_Gengrid_Item *elm_gengrid_first_item_get(evas.c_evas.Evas_Object *obj) - Elm_Gengrid_Item *elm_gengrid_last_item_get(evas.c_evas.Evas_Object *obj) - - Elm_Gengrid_Item *elm_gengrid_item_next_get(Elm_Gengrid_Item *item) - Elm_Gengrid_Item *elm_gengrid_item_prev_get(Elm_Gengrid_Item *item) - - evas.c_evas.Evas_Object *elm_gengrid_item_gengrid_get(Elm_Gengrid_Item *item) - void elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, evas.c_evas.Eina_Bool selected) - evas.c_evas.Eina_Bool elm_gengrid_item_selected_get(Elm_Gengrid_Item *item) - void elm_gengrid_item_show(Elm_Gengrid_Item *item) - void elm_gengrid_item_bring_in(Elm_Gengrid_Item *item) - void elm_gengrid_item_del(Elm_Gengrid_Item *item) - void *elm_gengrid_item_data_get(Elm_Gengrid_Item *item) - void elm_gengrid_item_data_set(Elm_Gengrid_Item *it, void *data) - evas.c_evas.Evas_Object *elm_gengrid_item_object_get(Elm_Gengrid_Item *it) - void elm_gengrid_item_update(Elm_Gengrid_Item *item) - void elm_gengrid_item_pos_get(Elm_Gengrid_Item *item, unsigned int *x, unsigned int *y) - - void elm_gengrid_item_tooltip_text_set(Elm_Gengrid_Item *item, char *text) - void elm_gengrid_item_tooltip_content_cb_set(Elm_Gengrid_Item *item, Elm_Tooltip_Item_Content_Cb func, void *data, evas.c_evas.Evas_Smart_Cb del_cb) - void elm_gengrid_item_tooltip_unset(Elm_Gengrid_Item *item) - void elm_gengrid_item_tooltip_style_set(Elm_Gengrid_Item *item, char *style) - char* elm_gengrid_item_tooltip_style_get(Elm_Gengrid_Item *item) - void elm_gengrid_item_cursor_set(Elm_Gengrid_Item *item, char *cursor) - void elm_gengrid_item_cursor_unset(Elm_Gengrid_Item *item) - void elm_gengrid_item_cursor_style_set(Elm_Gengrid_Item *item, char *style) - char* elm_gengrid_item_cursor_style_get(Elm_Gengrid_Item *item) - void elm_gengrid_item_cursor_engine_only_set(Elm_Gengrid_Item *item, evas.c_evas.Eina_Bool engine_only) - evas.c_evas.Eina_Bool elm_gengrid_item_cursor_engine_only_get(Elm_Gengrid_Item *item) + Elm_Object_Item *elm_gengrid_first_item_get(evas.c_evas.Evas_Object *obj) + Elm_Object_Item *elm_gengrid_last_item_get(evas.c_evas.Evas_Object *obj) + + Elm_Object_Item *elm_gengrid_item_next_get(Elm_Object_Item *item) + Elm_Object_Item *elm_gengrid_item_prev_get(Elm_Object_Item *item) + + evas.c_evas.Evas_Object *elm_gengrid_item_gengrid_get(Elm_Object_Item *item) + void elm_gengrid_item_selected_set(Elm_Object_Item *item, evas.c_evas.Eina_Bool selected) + evas.c_evas.Eina_Bool elm_gengrid_item_selected_get(Elm_Object_Item *item) + void elm_gengrid_item_show(Elm_Object_Item *item) + void elm_gengrid_item_bring_in(Elm_Object_Item *item) + void elm_gengrid_item_del(Elm_Object_Item *item) + void *elm_gengrid_item_data_get(Elm_Object_Item *item) + void elm_gengrid_item_data_set(Elm_Object_Item *it, void *data) + evas.c_evas.Evas_Object *elm_gengrid_item_object_get(Elm_Object_Item *it) + void elm_gengrid_item_update(Elm_Object_Item *item) + void elm_gengrid_item_pos_get(Elm_Object_Item *item, unsigned int *x, unsigned int *y) + + void elm_gengrid_item_tooltip_text_set(Elm_Object_Item *item, char *text) + void elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *item, Elm_Tooltip_Item_Content_Cb func, void *data, evas.c_evas.Evas_Smart_Cb del_cb) + void elm_gengrid_item_tooltip_unset(Elm_Object_Item *item) + void elm_gengrid_item_tooltip_style_set(Elm_Object_Item *item, char *style) + char* elm_gengrid_item_tooltip_style_get(Elm_Object_Item *item) + void elm_gengrid_item_cursor_set(Elm_Object_Item *item, char *cursor) + void elm_gengrid_item_cursor_unset(Elm_Object_Item *item) + void elm_gengrid_item_cursor_style_set(Elm_Object_Item *item, char *style) + char* elm_gengrid_item_cursor_style_get(Elm_Object_Item *item) + void elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *item, evas.c_evas.Eina_Bool engine_only) + evas.c_evas.Eina_Bool elm_gengrid_item_cursor_engine_only_get(Elm_Object_Item *item) # Check widget -- 1.7.8.4
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
