enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Fix shadowed variable warnings. 

Signed-off-by: Christopher Michael <cpmichael1@comcast.net>

SVN revision: 79032
This commit is contained in:
Christopher Michael 2012-11-09 17:54:00 +00:00
parent b9de9d2395
commit ae12f5efa9
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/evas/canvas/evas_events.c
View File

@ -206,11 +206,13 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
int no_rep = 0; int no_rep = 0;
Eina_List *l; Eina_List *l;
Evas_Object *eo_child; Evas_Object *eo_child;
Evas_Object_Protected_Data *child;
if (src->is_smart) if (src->is_smart)
{ {
src->proxy.src_event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE); src->proxy.src_event_in =
_evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in,
evas_object_smart_members_get_direct(eo_src),
NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
} }
else else
src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, eo_src); src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, eo_src);
@ -220,8 +222,9 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
EINA_LIST_FOREACH(src->proxy.src_event_in, l, eo_child) EINA_LIST_FOREACH(src->proxy.src_event_in, l, eo_child)
{ {
Evas_Object_Protected_Data *child = eo_data_get(eo_child, Evas_Object_Protected_Data *child;
EVAS_OBJ_CLASS);
child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
(child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
{ {
@ -242,6 +245,8 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
Eina_List *copy = evas_event_list_copy(src->proxy.src_event_in); Eina_List *copy = evas_event_list_copy(src->proxy.src_event_in);
EINA_LIST_FOREACH(copy, l, eo_child) EINA_LIST_FOREACH(copy, l, eo_child)
{ {
Evas_Object_Protected_Data *child;
child = eo_data_get(eo_child, EVAS_OBJ_CLASS); child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
ev->canvas.x = point_x; ev->canvas.x = point_x;
ev->canvas.y = point_y; ev->canvas.y = point_y;
@ -597,15 +602,15 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
Eina_List *l; Eina_List *l;
Evas_Object *eo_child; Evas_Object *eo_child;
Evas_Object_Protected_Data *child = NULL;
int addgrab = 0; int addgrab = 0;
if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1; if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
EINA_LIST_FOREACH(src->proxy.src_event_in, l, eo_child) EINA_LIST_FOREACH(src->proxy.src_event_in, l, eo_child)
{ {
Evas_Object_Protected_Data *child = eo_data_get(eo_child, Evas_Object_Protected_Data *child;
EVAS_OBJ_CLASS);
child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
{ {
child->mouse_grabbed += (addgrab + 1); child->mouse_grabbed += (addgrab + 1);
@ -618,6 +623,9 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
{ {
Evas_Coord point_x = ev->canvas.x; Evas_Coord point_x = ev->canvas.x;
Evas_Coord point_y = ev->canvas.y; Evas_Coord point_y = ev->canvas.y;
Evas_Object_Protected_Data *child;
child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
ev->canvas.x = point_x; ev->canvas.x = point_x;
ev->canvas.y = point_y; ev->canvas.y = point_y;
@ -628,7 +636,6 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
&ev->canvas.x, &ev->canvas.x,
&ev->canvas.y, &ev->canvas.y,
child->mouse_grabbed); child->mouse_grabbed);
child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
evas_object_event_callback_call(eo_child, child, evas_object_event_callback_call(eo_child, child,
EVAS_CALLBACK_MULTI_DOWN, ev, event_id); EVAS_CALLBACK_MULTI_DOWN, ev, event_id);
if (e->delete_me) break; if (e->delete_me) break;