forked from enlightenment/efl
elm src/bin: Applied elm_object_focus API change. Changed it to elm_object_focus_set.
SVN revision: 62062
This commit is contained in:
parent
9d5afb0d21
commit
4d7cb59930
|
@ -237,7 +237,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
|
||||||
|
|
||||||
evas_object_resize(win, 320, 300);
|
evas_object_resize(win, 320, 300);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -102,7 +102,7 @@ test_anchorview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
|
||||||
|
|
||||||
evas_object_resize(win, 320, 300);
|
evas_object_resize(win, 320, 300);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -201,7 +201,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
||||||
elm_box_pack_end(bx, bx2);
|
elm_box_pack_end(bx, bx2);
|
||||||
evas_object_show(bx2);
|
evas_object_show(bx2);
|
||||||
|
|
||||||
elm_object_focus(en);
|
elm_object_focus_set(en, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -530,7 +530,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
|
||||||
|
|
||||||
evas_object_resize(win, 320, 300);
|
evas_object_resize(win, 320, 300);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1272,7 +1272,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
||||||
|
|
||||||
evas_object_resize(win, 320, 480);
|
evas_object_resize(win, 320, 480);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1637,7 +1637,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
||||||
|
|
||||||
evas_object_resize(win, 320, 480);
|
evas_object_resize(win, 320, 480);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1694,7 +1694,7 @@ test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
|
||||||
|
|
||||||
evas_object_resize(win, 320, 300);
|
evas_object_resize(win, 320, 300);
|
||||||
|
|
||||||
elm_object_focus(win);
|
elm_object_focus_set(win, EINA_TRUE);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -29,8 +29,8 @@ _focus_obj(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||||
const char *type = evas_object_type_get(newfocus);
|
const char *type = evas_object_type_get(newfocus);
|
||||||
if ((type) && (!strcmp(type, "elm_widget")))
|
if ((type) && (!strcmp(type, "elm_widget")))
|
||||||
type = elm_object_widget_type_get(newfocus);
|
type = elm_object_widget_type_get(newfocus);
|
||||||
printf("elm_object_focus(%p) %s\n", newfocus, type);
|
printf("elm_object_focus_set(%p, EINA_TRUE) %s\n", newfocus, type);
|
||||||
elm_object_focus(newfocus);
|
elm_object_focus_set(newfocus, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -605,7 +605,7 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
|
||||||
evas_object_show(gl);
|
evas_object_show(gl);
|
||||||
|
|
||||||
// Add Mouse/Key Event Callbacks
|
// Add Mouse/Key Event Callbacks
|
||||||
elm_object_focus(gl);
|
elm_object_focus_set(gl, EINA_TRUE);
|
||||||
evas_object_event_callback_add(gl, EVAS_CALLBACK_KEY_DOWN, _key_down, gl);
|
evas_object_event_callback_add(gl, EVAS_CALLBACK_KEY_DOWN, _key_down, gl);
|
||||||
evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, gl);
|
evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, gl);
|
||||||
evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_UP, _mouse_up, gl);
|
evas_object_event_callback_add(gl, EVAS_CALLBACK_MOUSE_UP, _mouse_up, gl);
|
||||||
|
|
|
@ -268,7 +268,7 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
|
||||||
elm_box_pack_end(bx, gl);
|
elm_box_pack_end(bx, gl);
|
||||||
evas_object_show(gl);
|
evas_object_show(gl);
|
||||||
|
|
||||||
elm_object_focus(gl);
|
elm_object_focus_set(gl, EINA_TRUE);
|
||||||
|
|
||||||
ani = ecore_animator_add(_anim, gl);
|
ani = ecore_animator_add(_anim, gl);
|
||||||
gld->glapi = elm_glview_gl_api_get(gl);
|
gld->glapi = elm_glview_gl_api_get(gl);
|
||||||
|
|
Loading…
Reference in New Issue