From ae12d9c09a0f0e28af83878e243bfaeb6dfb45dc Mon Sep 17 00:00:00 2001 From: Hyoyoung Chang Date: Tue, 13 Mar 2012 06:22:39 +0000 Subject: [PATCH] After elm radically changed, some compilation errors are not fixed. I changed for this. 1. add a parameter for item_bring_in -elm_genlist_item_bring_in(it); +elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_IN); 2. change a enum type name - Elm_Genlist_Item_Flags + Elm_Genlist_Item_Type 3. change a enum name - if (!parent) flags = ELM_GENLIST_ITEM_SUBITEMS; + if (!parent) flags = ELM_GENLIST_ITEM_TREE; Signed-off-by: Hyoyoung Chang SVN revision: 69283 --- eflxx_examples/src/elementaryxx/full/test_genlist.cpp | 2 +- eflxx_examples/src/elementaryxx/full/test_panel.cpp | 2 +- elementaryxx/include/elementaryxx/GenList.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eflxx_examples/src/elementaryxx/full/test_genlist.cpp b/eflxx_examples/src/elementaryxx/full/test_genlist.cpp index 410a8e3..05bc586 100644 --- a/eflxx_examples/src/elementaryxx/full/test_genlist.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_genlist.cpp @@ -1113,7 +1113,7 @@ static void gl4_exp (Evasxx::Object &obj, void *event_info, GenList *gl) (void *)(val + 2)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, &itc4, - (void *)(val + 3)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_SUBITEMS, gl4_sel/* func */, + (void *)(val + 3)/* item data */, glit/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, NULL/* func data */); #endif } diff --git a/eflxx_examples/src/elementaryxx/full/test_panel.cpp b/eflxx_examples/src/elementaryxx/full/test_panel.cpp index 046dd5b..e9e5c88 100644 --- a/eflxx_examples/src/elementaryxx/full/test_panel.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_panel.cpp @@ -157,7 +157,7 @@ static void _fill_list (Evasxx::Object *obj) NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); else elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), - NULL, ELM_GENLIST_ITEM_SUBITEMS, + NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); free(real); } diff --git a/elementaryxx/include/elementaryxx/GenList.h b/elementaryxx/include/elementaryxx/GenList.h index 0e59dc7..98a2ac0 100644 --- a/elementaryxx/include/elementaryxx/GenList.h +++ b/elementaryxx/include/elementaryxx/GenList.h @@ -177,8 +177,8 @@ class GenListColumnSelector; * internal data (eg the struct with the original item data). The parent * parameter is the parent genlist item this belongs to if it is a tree, and * NULL if there is no parent. The flags can be a bitmask of - * ELM_GENLIST_ITEM_NONE and ELM_GENLIST_ITEM_SUBITEMS. If - * ELM_GENLIST_ITEM_SUBITEMS is set then this item is displayed as a item + * ELM_GENLIST_ITEM_NONE and ELM_GENLIST_ITEM_TREE. If + * ELM_GENLIST_ITEM_TREE is set then this item is displayed as a item * that is able to expand and have child items. The func parameter is a * convenience callback that is called when the item is selected and the data * parameter will be the func_data parameter, obj be the genlist object and @@ -371,9 +371,9 @@ private: #if 0 /* operations to add items */ - EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); - EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); - EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Object_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item_Type flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Object_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item *before, Elm_Genlist_Item_Type flags, Evas_Smart_Cb func, const void *func_data); + EAPI Elm_Object_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Object_Item *parent, Elm_Genlist_Item *after, Elm_Genlist_Item_Type flags, Evas_Smart_Cb func, const void *func_data); /* operations to retrieve existing items */