timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary/gengrid - removed elm_gengrid_item_sorted_insert 

and rename elm_gengrid_item_direct_sorted_insert to elm_gengrid_item_sorted_insert



SVN revision: 68545
This commit is contained in:
ChunEon Park 2012-02-29 10:30:51 +00:00
parent 5f6c600ab6
commit 2b3dad09a2
5 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -665,7 +665,7 @@ _main_cb(void *data, Eio_File *handler, const Eina_File_Direct_Info *info __UNUS
_file_list_cmp, NULL, NULL);
}
else if (wr->wd->mode == ELM_FILESELECTOR_GRID)
elm_gengrid_item_direct_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"),
elm_gengrid_item_sorted_insert(wr->wd->files_grid, eio_file_associate_find(handler, "type/grid"),
eina_stringshare_ref(eio_file_associate_find(handler, "filename")),
_file_grid_cmp, NULL, NULL);
}

24
legacy/elementary/src/lib/elm_deprecated.h
View File

@ -3965,6 +3965,30 @@ EINA_DEPRECATED EAPI const Evas_Object *elm_gengrid_item_object_get(c
*/
EINA_DEPRECATED EAPI void elm_gengrid_item_item_class_set(Elm_Object_Item *it, const Elm_Gengrid_Item_Class *gic);
/**
* Insert an item in a gengrid widget using a user-defined sort function.
*
* @param obj The gengrid object.
* @param gic The item class for the item.
* @param data The item data.
* @param comp User defined comparison function that defines the sort order
* based on Elm_Gen_Item.
* @param func Convenience function called when the item is selected.
* @param func_data Data to be passed to @p func.
* @return A handle to the item added or @c NULL, on errors.
*
* This inserts an item in the gengrid based on user defined comparison function.
*
* @see elm_gengrid_item_append()
* @see elm_gengrid_item_prepend()
* @see elm_gengrid_item_insert_after()
* @see elm_object_item_del()
* @see elm_gengrid_item_sorted_insert()
*
* @deprecated Use elm_gengrid_item_sorted_insert() instead
* @ingroup Gengrid
*/
EINA_DEPRECATED EAPI Elm_Object_Item *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
/**
* Append a filter function for text inserted in the entry

40
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -1854,15 +1854,6 @@ _scr_scroll(void *data,
evas_object_smart_callback_call(data, SIG_SCROLL, NULL);
}
static int
_elm_gengrid_item_compare_data(const void *data, const void *data1)
{
const Elm_Gen_Item *it = data;
const Elm_Gen_Item *item1 = data1;
return it->wd->item_compare_data_cb(it->base.data, item1->base.data);
}
static int
_elm_gengrid_item_compare(const void *data, const void *data1)
{
@ -2205,12 +2196,12 @@ elm_gengrid_item_insert_after(Evas_Object *obj,
}
EAPI Elm_Object_Item *
elm_gengrid_item_direct_sorted_insert(Evas_Object *obj,
const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
elm_gengrid_item_sorted_insert(Evas_Object *obj,
const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
{
Elm_Gen_Item *it;
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@ -2232,18 +2223,15 @@ elm_gengrid_item_direct_sorted_insert(Evas_Object *obj,
return (Elm_Object_Item *) it;
}
EAPI Elm_Object_Item *
elm_gengrid_item_sorted_insert(Evas_Object *obj,
const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
EINA_DEPRECATED Elm_Object_Item *
elm_gengrid_item_direct_sorted_insert(Evas_Object *obj,
const Elm_Gengrid_Item_Class *itc,
const void *data,
Eina_Compare_Cb comp,
Evas_Smart_Cb func,
const void *func_data)
{
Widget_Data *wd = elm_widget_data_get(obj);
wd->item_compare_data_cb = comp;
return elm_gengrid_item_direct_sorted_insert(obj, itc, data, _elm_gengrid_item_compare_data, func, func_data);
return elm_gengrid_item_sorted_insert(obj, itc, data, comp, func, func_data);
}
EAPI void

30
legacy/elementary/src/lib/elm_gengrid.h
View File

@ -551,43 +551,19 @@ EAPI Elm_Object_Item *elm_gengrid_item_insert_after(Evas_Object *obj
* @param func_data Data to be passed to @p func.
* @return A handle to the item added or @c NULL, on errors.
*
* This inserts an item in the gengrid based on user defined comparison function.
* This inserts an item in the gengrid based on user defined comparison
* function. The two arguments passed to the function @p func are gengrid
* item handles to compare.
*
* @see elm_gengrid_item_append()
* @see elm_gengrid_item_prepend()
* @see elm_gengrid_item_insert_after()
* @see elm_object_item_del()
* @see elm_gengrid_item_direct_sorted_insert()
*
* @ingroup Gengrid
*/
EAPI Elm_Object_Item *elm_gengrid_item_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
/**
* Insert an item in a gengrid widget using a user-defined sort function.
*
* @param obj The gengrid object.
* @param gic The item class for the item.
* @param data The item data.
* @param comp User defined comparison function that defines the sort order
* based on Elm_Gen_Item.
* @param func Convenience function called when the item is selected.
* @param func_data Data to be passed to @p func.
* @return A handle to the item added or @c NULL, on errors.
*
* This inserts an item in the gengrid based on user defined comparison function.
*
* @see elm_gengrid_item_append()
* @see elm_gengrid_item_prepend()
* @see elm_gengrid_item_insert_after()
* @see elm_object_item_del()
* @see elm_gengrid_item_sorted_insert()
*
* @ingroup Gengrid
*/
//XXX: should be removed.
EAPI Elm_Object_Item *elm_gengrid_item_direct_sorted_insert(Evas_Object *obj, const Elm_Gengrid_Item_Class *gic, const void *data, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);
/**
* Set whether items on a given gengrid widget are to get their
* selection callbacks issued for @b every subsequent selection

9
legacy/elementary/src/lib/elm_genlist.h
View File

@ -900,6 +900,15 @@ EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj
* @param func_data Data passed to @p func above.
* @return A handle to the item added or NULL if not possible
*
* This inserts an item in the genlist based on user defined comparison
* function. The two arguments passed to the function @p func are genlist item
* handles to compare.
*
* @see elm_genlist_item_append()
* @see elm_genlist_item_prepend()
* @see elm_genlist_item_insert_after()
* @see elm_object_item_del()
* @ingroup Genlist
*/
EAPI Elm_Object_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Eina_Compare_Cb comp, Evas_Smart_Cb func, const void *func_data);