change code to process back button

Change-Id: I3ac01f3b50a2d9fbbf9c6e3ab4aa40474caf2abd

diff --git a/ism/demos/isf_event_efl.cpp b/ism/demos/isf_event_efl.cpp
index a154862..38bf7d8 100644 (file)
--- a/ism/demos/isf_event_efl.cpp
+++ b/ism/demos/isf_event_efl.cpp
@@ -114,7 +114,7 @@ static Eina_Bool _ecore_imf_event_commit_cb (void *data, int type, void *event)
     return ECORE_CALLBACK_CANCEL;
 }
 
-static void nf_back_event_cb (void *data, Evas_Object *obj, void *event_info)
+static Eina_Bool _nf_back_event_cb (void *data, Elm_Object_Item *it)
 {
     evas_object_event_callback_del (_label1, EVAS_CALLBACK_KEY_UP, NULL);
     evas_object_event_callback_del (_label2, EVAS_CALLBACK_KEY_UP, NULL);
@@ -135,6 +135,8 @@ static void nf_back_event_cb (void *data, Evas_Object *obj, void *event_info)
         ecore_event_handler_del (_commit_handler);
         _commit_handler = NULL;
     }
+
+    return EINA_TRUE;
 }
 
 static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_info)
@@ -227,8 +229,7 @@ static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_i
     evas_object_smart_callback_add (_ise_show_button, "clicked", _button_bt, NULL);
 
     Elm_Object_Item *it = elm_naviframe_item_push (ad->naviframe, _("Label Event"), NULL, NULL, layout, NULL);
-    Evas_Object *back_btn = elm_object_item_part_content_get (it, "prev_btn");
-    evas_object_smart_callback_add (back_btn, "clicked",  nf_back_event_cb, ad);
+    elm_naviframe_item_pop_cb_set (it, _nf_back_event_cb, ad);
 }
 
 static void _list_click (void *data, Evas_Object *obj, void *event_info)

diff --git a/ism/demos/isf_imcontrol_efl.cpp b/ism/demos/isf_imcontrol_efl.cpp
index 5acf925..3887190 100644 (file)
--- a/ism/demos/isf_imcontrol_efl.cpp
+++ b/ism/demos/isf_imcontrol_efl.cpp
@@ -241,12 +241,14 @@ static void test_api (void *data, Evas_Object *obj, void *event_info)
     }
 }
 
-static void _nf_back_event (void *data, Evas_Object *obj, void *event_info)
+static Eina_Bool _nf_back_event_cb (void *data, Elm_Object_Item *it)
 {
     if (imf_context) {
         ecore_imf_context_del (imf_context);
         imf_context = NULL;
     }
+
+    return EINA_TRUE;
 }
 
 static Evas_Object *_create_imcontrolapi_list (Evas_Object *parent)
@@ -287,9 +289,7 @@ void imcontrolapi_bt (void *data, Evas_Object *obj, void *event_info)
     gl = _create_imcontrolapi_list (ad->naviframe);
 
     Elm_Object_Item *navi_it = elm_naviframe_item_push (ad->naviframe, _("IM Control"), NULL, NULL, gl, NULL);
-
-    Evas_Object *back_btn = elm_object_item_part_content_get (navi_it, "prev_btn");
-    evas_object_smart_callback_add (back_btn, "clicked", _nf_back_event, ad);
+    elm_naviframe_item_pop_cb_set (navi_it, _nf_back_event_cb, ad);
 }
 
 /*