X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_multibuttonentry.c;h=d5d983cc125ce1efcddf5d4cd776263aff5abcec;hb=HEAD;hp=c3247c51d7ed7debbf506156110baf4712f7f05a;hpb=a4cf0696d1b7dee6afd578c2294cdc217ced2ca1;p=framework%2Fuifw%2Felementary.git

diff --git a/src/bin/test_multibuttonentry.c b/src/bin/test_multibuttonentry.c
index c3247c5..d5d983c 100644
--- a/src/bin/test_multibuttonentry.c
+++ b/src/bin/test_multibuttonentry.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static void
@@ -9,8 +9,8 @@ _item_selected_cb(void *data __UNUSED__,
                   Evas_Object *obj __UNUSED__,
                   void *event_info)
 {
-   Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *)event_info;
-   printf("selected item = %s\n", elm_multibuttonentry_item_label_get(item));
+   Elm_Object_Item *mbe_it = event_info;
+   printf("selected item = %s\n", elm_object_item_text_get(mbe_it));
 }
 
 // "item,added" smart callback of multibuttonentry.
@@ -19,8 +19,8 @@ _item_added_cb(void *data __UNUSED__,
                Evas_Object *obj __UNUSED__,
                void *event_info)
 {
-   Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *)event_info;
-   printf("added item = %s\n", elm_multibuttonentry_item_label_get(item));
+   Elm_Object_Item *mbe_it = event_info;
+   printf("added item = %s\n", elm_object_item_text_get(mbe_it));
 }
 
 // "item,deleted" smart callback
@@ -38,8 +38,8 @@ _item_clicked_cb(void *data __UNUSED__,
                  Evas_Object *obj __UNUSED__,
                  void *event_info )
 {
-   Elm_Multibuttonentry_Item *item = (Elm_Multibuttonentry_Item *)event_info;
-   printf("clicked item = %s\n", elm_multibuttonentry_item_label_get(item));
+   Elm_Object_Item *mbe_it = event_info;
+   printf("clicked item = %s\n", elm_object_item_text_get(mbe_it));
 }
 
 static void
@@ -48,7 +48,7 @@ _mbe_clicked_cb(void *data __UNUSED__,
                 void *event_info __UNUSED__ )
 {
    //Unset the multibuttonentry to contracted mode of single line
-   elm_multibuttonentry_shrink_mode_set(obj, 0);
+   elm_multibuttonentry_expanded_set(obj, EINA_TRUE);
    printf("A multibuttonentry is clicked!\n");
    Evas_Object *entry;
    entry = elm_multibuttonentry_entry_get(obj);
@@ -71,7 +71,7 @@ _mbe_unfocused_cb(void *data __UNUSED__,
                   void *event_info __UNUSED__ )
 {
    //Set the multibuttonentry to contracted mode of single line
-   elm_multibuttonentry_shrink_mode_set(obj, 1);
+   elm_multibuttonentry_expanded_set(obj, EINA_FALSE);
    printf("multibuttonentry unfocused!\n");
 }
 
@@ -94,11 +94,11 @@ _expanded_cb(void *data __UNUSED__,
 
 // "contracted" smart callback
 static void
-_shrank_cb(void *data __UNUSED__,
+_contracted_cb(void *data __UNUSED__,
            Evas_Object *obj __UNUSED__,
            void *event_info __UNUSED__)
 {
-   printf("shrank!\n");
+   printf("contracted!\n");
 }
 
 // "contracted,state,changed" smart callback
@@ -143,8 +143,8 @@ _add_multibuttonentry(Evas_Object *parent)
    evas_object_show(scr);
 
    mbe = elm_multibuttonentry_add(parent);
-   elm_multibuttonentry_label_set(mbe, "To: ");
-   elm_multibuttonentry_guide_text_set(mbe, "Tap to add recipient");
+   elm_object_text_set(mbe, "To: ");
+   elm_object_part_text_set(mbe, "guide", "Tap to add recipient");
    evas_object_size_hint_weight_set(mbe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(mbe, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_content_set(scr, mbe);
@@ -164,7 +164,7 @@ _add_multibuttonentry(Evas_Object *parent)
    evas_object_smart_callback_add(mbe, "unfocused", _mbe_unfocused_cb, NULL);
 
    evas_object_smart_callback_add(mbe, "expanded", _expanded_cb, NULL);
-   evas_object_smart_callback_add(mbe, "shrank", _shrank_cb, NULL);
+   evas_object_smart_callback_add(mbe, "contracted", _contracted_cb, NULL);
    evas_object_smart_callback_add(mbe, "shrink,state,changed", _shrink_state_changed_cb, NULL);
 
    evas_object_resize(mbe, 220, 300);
@@ -199,19 +199,13 @@ test_multibuttonentry(void *data __UNUSED__,
                       Evas_Object *obj __UNUSED__,
                       void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *sc, *bx;
+   Evas_Object *win, *sc, *bx;
    Evas_Object *ly;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "Multibuttonentry", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Multibuttonentry");
+   win = elm_win_util_standard_add("multibuttonentry", "MultiButtonEntry");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_show(bg);
-
    ly = elm_layout_add(win);
    snprintf(buf, sizeof(buf), "%s/objects/multibuttonentry.edj", elm_app_data_dir_get());
    elm_layout_file_set(ly, buf, "multibuttonentry_test");