From: Shinwoo Kim <cinoo.kim@samsung.com>
Date: Tue, 30 Apr 2013 03:37:45 +0000 (+0900)
Subject: [access] use ecore_x_atom values for scroll, mouse message
X-Git-Tag: submit/tizen_2.2/20130714.145026~127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b3a84f16a8ca97f6952c1a0dc874b5e7af342df;p=framework%2Fuifw%2Felementary.git

[access] use ecore_x_atom values for scroll, mouse message

Change-Id: Ic6c07397cdf0c08928b78dfc1b679046bedb43d2

Conflicts:

	src/lib/elm_access.c
	src/lib/elm_widget.h
	src/lib/elm_win.c
---

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index aa7b272..e009bdc 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2134,6 +2134,15 @@ _elm_win_client_message(void *data,
                   free(a);
                }
              else if ((unsigned int)e->data.l[1] ==
+<<<<<<< HEAD
+=======
+                      ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_MOUSE)
+               {
+                  _elm_access_highlight_object_mouse(ELM_WIDGET_DATA(sd)->obj,
+                    e->data.l[2], e->data.l[3], e->data.l[4]);
+               }
+             else if ((unsigned int)e->data.l[1] ==
+>>>>>>> 6908a4b... [access] use ecore_x_atom values for scroll, mouse message
                       ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_BACK)
                {
                   _elm_access_highlight_object_activate