From bece5ff4a9dc8b36e30f83501d59a3d16100d993 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Thu, 15 Mar 2012 06:22:25 +0000 Subject: [PATCH] remove deprecated with elm_genlist_always_select_mode_get/set elm_genlist_no_select_mode_get/set function SVN revision: 69355 --- .../src/elementaryxx/full/test_genlist.cpp | 4 ++-- elementaryxx/include/elementaryxx/GenList.h | 14 ++++++++------ elementaryxx/src/GenList.cpp | 6 ++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/eflxx_examples/src/elementaryxx/full/test_genlist.cpp b/eflxx_examples/src/elementaryxx/full/test_genlist.cpp index 9d3c4d5..264921b 100644 --- a/eflxx_examples/src/elementaryxx/full/test_genlist.cpp +++ b/eflxx_examples/src/elementaryxx/full/test_genlist.cpp @@ -1018,7 +1018,7 @@ void test_genlist5 (void *data, Evas_Object *obj, void *event_info) bx->show (); GenList *gl = GenList::factory (*win); - gl->setAlwaysSelectMode (true); + gl->setSelectMode (ELM_OBJECT_SELECT_MODE_ALWAYS); gl->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); gl->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); gl->show (); @@ -1203,7 +1203,7 @@ void test_genlist6(void *data, Evas_Object *obj, void *event_info) bx->show (); GenList *gl = GenList::factory (*win); - gl->setAlwaysSelectMode (true); + gl->setSelectMode (ELM_OBJECT_SELECT_MODE_ALWAYS); gl->setAlignHintSize (EVAS_HINT_FILL, EVAS_HINT_FILL); gl->setWeightHintSize (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); gl->show (); diff --git a/elementaryxx/include/elementaryxx/GenList.h b/elementaryxx/include/elementaryxx/GenList.h index 73a3629..b0e575d 100644 --- a/elementaryxx/include/elementaryxx/GenList.h +++ b/elementaryxx/include/elementaryxx/GenList.h @@ -245,11 +245,11 @@ class GenListColumnSelector; * * Items will only call their selection func and callback when first becoming * selected. Any further clicks will do nothing, unless you enable always - * select with elm_genlist_always_select_mode_set(). This means even if - * selected, every click will make the selected callbacks be called. - * elm_genlist_no_select_mode_set() will turn off the ability to select - * items entirely and they will neither appear selected nor call selected - * callback functions. + * select with elm_genlist_select_mode_set() using ELM_OBJECT_SELECT_MODE_ALWAYS. + * This means even if selected, every click will make the selected callbacks be called. + * elm_genlist_select_mode_set() using ELM_OBJECT_SELECT_MODE_NONE will turn off + * the ability to select items entirely and they will neither appear selected + * nor call selected callback functions. * * Remember that you can create new styles and add you own theme augmentation * per application with elm_theme_extension_add(). If you absolutely must @@ -268,7 +268,9 @@ public: void setHorizontal (Elm_List_Mode mode); Elm_List_Mode getHorizontal (); - + + Elm_Object_Select_Mode setSelectMode (Elm_Object_Select_Mode mode); + void setHomogeneous (bool homogeneous); bool getHomogeneous (); diff --git a/elementaryxx/src/GenList.cpp b/elementaryxx/src/GenList.cpp index 6f9f4e0..49dd4ec 100644 --- a/elementaryxx/src/GenList.cpp +++ b/elementaryxx/src/GenList.cpp @@ -75,6 +75,12 @@ int GenList::getBlockCound () return elm_genlist_block_count_get (o); } +bool GenList::setSelectMode (Elm_Object_Select_Mode mode) +{ + return elm_genlist_select_mode_set (o, mode); +} + + void GenList::setDataModel (GenDataModel &model) { mModel = &model;