Revert "[Title] Modify to use elm genlist instead of elm list."

This reverts commit b3e241fc29dd061cd897101b9a1767d9ff346a77

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
index 06910f5..0bff41e 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
@@ -31,19 +31,21 @@ void menuItemActivated(void* data, Evas_Object* obj, void* event_info)
 {
     Ewk_Popup_Picker* picker = static_cast<Ewk_Popup_Picker*>(data);
 
-    Elm_Object_Item* selected = elm_genlist_selected_item_get(obj);
+    Elm_Object_Item* selected = elm_list_selected_item_get(obj);
     void* it;
 
+    const Eina_List* l;
+    const Eina_List* items;
     Elm_Object_Item* currentItem = picker->firstItem;
     int i = 0;
-
-    while (currentItem) {
+    items = elm_list_items_get(obj);
+    EINA_LIST_FOREACH(items, l, it) {
         if(currentItem == selected)
             break;
-        currentItem = elm_genlist_item_next_get(currentItem);
+
+        currentItem = elm_list_item_next(currentItem);
         i++;
     }
-
     picker->selectedIndex = i;
     ewk_view_popup_menu_select(picker->parent, i);
 }
@@ -56,14 +58,6 @@ void listClosed(void *data, Evas_Object *obj, const char *emission, const char *
     ewk_view_popup_menu_close(picker->parent);
 }
 
-static char* _listLabelGet(void* data, Evas_Object* obj, const char* part)
-{
-    Ewk_Popup_Menu_Item* menuItem = static_cast<Ewk_Popup_Menu_Item*>(data);
-
-    if (!strncmp(part, "elm.text", strlen("elm.text")))
-        return strdup(ewk_popup_menu_item_text_get(menuItem));
-}
-
 Ewk_Popup_Picker* ewk_popup_picker_new(Evas_Object* parent, Eina_List* items, int selectedIndex)
 {
     Ewk_Popup_Picker* picker = new Ewk_Popup_Picker;
@@ -80,18 +74,10 @@ Ewk_Popup_Picker* ewk_popup_picker_new(Evas_Object* parent, Eina_List* items, in
             "mouse,clicked,1", "dimm", listClosed, picker);
     }
 
-    picker->popupList = elm_genlist_add(parent);
+    picker->popupList = elm_list_add(parent);
     evas_object_size_hint_weight_set(picker->popupList, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(picker->popupList, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-    static Elm_Genlist_Item_Class itemClass;
-
-    itemClass.item_style = "1text";
-    itemClass.func.text_get = _listLabelGet;
-    itemClass.func.content_get = 0;
-    itemClass.func.state_get = 0;
-    itemClass.func.del = 0;
-
     void* itemv;
     const Eina_List* l;
 
@@ -100,11 +86,11 @@ Ewk_Popup_Picker* ewk_popup_picker_new(Evas_Object* parent, Eina_List* items, in
     EINA_LIST_FOREACH(items, l, itemv) {
         Ewk_Popup_Menu_Item* menuItem = static_cast<Ewk_Popup_Menu_Item*>(itemv);
 
-        Elm_Object_Item* itemObject = elm_genlist_item_append(picker->popupList, &itemClass, menuItem, 0, ELM_GENLIST_ITEM_NONE, 0, 0);
+        Elm_Object_Item* itemObject = elm_list_item_append(picker->popupList, menuItem->text, 0, 0, 0, 0);
         if (!index)
             picker->firstItem = itemObject;
         if (selectedIndex == index)
-            elm_genlist_item_selected_set(itemObject, true);
+            elm_list_item_selected_set(itemObject, true);
         index++;
     }