elm test_genlist.c: Use proper test name for genlist decorate item/all modes.
[framework/uifw/elementary.git] / src / bin / test_menu.c
index 2f892fa..cc940d7 100644 (file)
@@ -1,10 +1,10 @@
-#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;
+static Evas_Object *menu;
 
 static void
 _show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
@@ -77,12 +77,12 @@ _populate_2(Elm_Object_Item *menu_it)
 }
 
 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, *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");
@@ -97,17 +97,12 @@ _populate_1(Evas_Object *win, Elm_Object_Item *menu_it)
 void
 test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
+   Evas_Object *win, *rect;
    Elm_Object_Item *menu_it;
 
-   win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Menu");
+   win = elm_win_util_standard_add("menu", "Menu");
    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);
-
    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);