Revert a wrong commit. Un-wanted files are committed together.

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

diff --git a/src/bin/test_menu.c b/src/bin/test_menu.c
index 47c17de..753f22d 100644 (file)
--- a/src/bin/test_menu.c
+++ b/src/bin/test_menu.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 Evas_Object *win, *bg, *menu, *rect;
@@ -24,13 +24,13 @@ _populate_4(Elm_Object_Item *menu_it)
    elm_menu_item_separator_add(menu, menu_it);
    menu_it2 = elm_menu_item_add(menu, menu_it, "go-last", "Disabled item", NULL,
                                 NULL);
-   elm_menu_item_disabled_set(menu_it2, EINA_TRUE);
+   elm_object_item_disabled_set(menu_it2, EINA_TRUE);
    menu_it2 = elm_menu_item_add(menu, menu_it, "go-next", "Disabled item", NULL,
                                 NULL);
-   elm_menu_item_disabled_set(menu_it2, EINA_TRUE);
+   elm_object_item_disabled_set(menu_it2, EINA_TRUE);
    menu_it2 = elm_menu_item_add(menu, menu_it, "go-up", "Disabled item", NULL,
                                 NULL);
-   elm_menu_item_disabled_set(menu_it2, EINA_TRUE);
+   elm_object_item_disabled_set(menu_it2, EINA_TRUE);
 }
 
 static void
@@ -44,7 +44,7 @@ _populate_3(Elm_Object_Item *menu_it)
    elm_menu_item_separator_add(menu, menu_it);
    menu_it2 = elm_menu_item_add(menu, menu_it, "media-playback-stop",
                                 "Disabled item", NULL, NULL);
-   elm_menu_item_disabled_set(menu_it2, EINA_TRUE);
+   elm_object_item_disabled_set(menu_it2, EINA_TRUE);
 }
 
 static void
@@ -71,24 +71,25 @@ _populate_2(Elm_Object_Item *menu_it)
 
    menu_it3 = elm_menu_item_add(menu, menu_it, "system-run", "Disabled item",
                                 NULL, NULL);
-   elm_menu_item_disabled_set(menu_it3, EINA_TRUE);
+   elm_object_item_disabled_set(menu_it3, EINA_TRUE);
 
    _populate_4(menu_it2);
 }
 
 static void
-_populate_1(Evas_Object *win, Elm_Object_Item *menu_it)
+_populate_1(Evas_Object *obj, Elm_Object_Item *menu_it)
 {
-   Elm_Object_Item *menu_it2;
+   Elm_Object_Item *menu_it2, *menu_it3;
    Evas_Object *radio;
 
-   radio = elm_radio_add(win);
+   radio = elm_radio_add(obj);
    elm_radio_state_value_set(radio, 0);
    elm_radio_value_set(radio, 0);
    elm_object_text_set(radio, "radio in menu");
    menu_it2 = elm_menu_item_add(menu, menu_it, "object-rotate-left", "menu 1",
                                 NULL, NULL);
-   elm_menu_item_add_object(menu, menu_it, radio, NULL, NULL);
+   menu_it3 = elm_menu_item_add(menu, menu_it, NULL, NULL, NULL, NULL);
+   elm_object_item_content_set(menu_it3, radio);
 
    _populate_2(menu_it2);
 }
@@ -109,6 +110,7 @@ test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
 
    rect = evas_object_rectangle_add(evas_object_evas_get(win));
    elm_win_resize_object_add(win, rect);
+   evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_color_set(rect, 0, 0, 0, 0);
    evas_object_show(rect);