Merge "[elm_datetime.h] Datetime default minimum year is changed to 1902 and document...

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

diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index e5fb5cd..71a5a8a 100644 (file)
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -1,8 +1,8 @@
 /* Test for Focus Chain Linear*/
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static Evas_Object *foc = NULL;
@@ -33,11 +33,7 @@ _add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
-   elm_entry_single_line_set(en, 1);
-=======
    elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_box_pack_start(bx, en);
    evas_object_show(en);
 }
@@ -57,19 +53,13 @@ _hide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNU
 void
 test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *bt, *en;
+   Evas_Object *win, *bx, *bt, *en;
 
-   win = elm_win_add(NULL, "focus3", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Focus 3");
+   win = elm_win_util_standard_add("focus3", "Focus 3");
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
    evas_object_resize(win, 320, 480);
    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);
-
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, bx);
@@ -82,11 +72,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
-   elm_entry_single_line_set(en, 1);
-=======
    elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
    elm_box_pack_end(bx, en);
    evas_object_show(en);
 
@@ -119,8 +105,6 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    evas_object_show(win);
 }
-<<<<<<< HEAD
-=======
 
 static void
 highlight_enabled_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
@@ -312,5 +296,4 @@ test_focus4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_resize(win, 320, 320);
    evas_object_show(win);
 }
->>>>>>> remotes/origin/upstream
 #endif