src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / bin / test_gengrid.c

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 88624f0..a43dcad 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -15,7 +15,6 @@ char *grid_text_get(void *data, Evas_Object *obj __UNUSED__,
 Eina_Bool grid_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
                          const char *part __UNUSED__);
 void grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__);
-static Evas_Object *gtt_item_icon(void *data   __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *tt, void *item   __UNUSED__);
 
 typedef struct _Testitem
 {
@@ -71,7 +70,7 @@ set_api_state(api_data *api)
          break;
 
       case GRID_NO_SELECT_MODE: /* 2 */
-         elm_gengrid_select_mode_set(grid, ELM_OBJECT_NO_SELECT);
+         elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_NONE);
          break;
 
       case GRID_NO_BOUNCE: /* 3 */
@@ -145,20 +144,6 @@ static const char *cur[4] =
    ELM_CURSOR_CROSS,
 };
 
-static Evas_Object *
-gtt_item_icon(void *data   __UNUSED__,
-              Evas_Object *obj __UNUSED__,
-              Evas_Object *tt,
-              void *item   __UNUSED__)
-{
-   Evas_Object *ic = elm_icon_add(tt);
-   char buf[PATH_MAX];
-   snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
-   return ic;
-}
-
 static int n_current_pic = 0;
 static void
 _horizontal_grid(void *data, Evas_Object *obj, void *event_info __UNUSED__)
@@ -290,7 +275,10 @@ static void
 always_select_mode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    api_data *api = data;
-   elm_gengrid_always_select_mode_set(api->grid, elm_check_state_get(obj));
+   if (elm_check_state_get(obj))
+     elm_gengrid_highlight_mode_set(api->grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
+   else
+     elm_gengrid_highlight_mode_set(api->grid, ELM_OBJECT_SELECT_MODE_DEFAULT);
 }
 
 static void