summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/efl_event_pointer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/efl_event_pointer.c')
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 637f19f..8bd45c4 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -29,17 +29,17 @@ _del_hook(Eo *evt)
29{ 29{
30 if (!s_cached_event) 30 if (!s_cached_event)
31 { 31 {
32 if (eo_parent_get(evt)) 32 if (efl_parent_get(evt))
33 { 33 {
34 eo_ref(evt); 34 eo_ref(evt);
35 eo_parent_set(evt, NULL); 35 efl_parent_set(evt, NULL);
36 } 36 }
37 s_cached_event = evt; 37 s_cached_event = evt;
38 } 38 }
39 else 39 else
40 { 40 {
41 eo_del_intercept_set(evt, NULL); 41 efl_del_intercept_set(evt, NULL);
42 eo_del(evt); 42 efl_del(evt);
43 } 43 }
44} 44}
45 45
@@ -55,12 +55,12 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
55 evt = s_cached_event; 55 evt = s_cached_event;
56 s_cached_event = NULL; 56 s_cached_event = NULL;
57 efl_event_reset(evt); 57 efl_event_reset(evt);
58 eo_parent_set(evt, owner); 58 efl_parent_set(evt, owner);
59 } 59 }
60 else 60 else
61 { 61 {
62 evt = eo_add(EFL_EVENT_POINTER_CLASS, owner); 62 evt = eo_add(EFL_EVENT_POINTER_CLASS, owner);
63 eo_del_intercept_set(evt, _del_hook); 63 efl_del_intercept_set(evt, _del_hook);
64 } 64 }
65 65
66 ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 66 ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
@@ -71,18 +71,18 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
71} 71}
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_event_pointer_class_destructor(Eo_Class *klass EINA_UNUSED) 74_efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
75{ 75{
76 // this is a strange situation... 76 // this is a strange situation...
77 eo_del_intercept_set(s_cached_event, NULL); 77 efl_del_intercept_set(s_cached_event, NULL);
78 eo_del(s_cached_event); 78 efl_del(s_cached_event);
79 s_cached_event = NULL; 79 s_cached_event = NULL;
80} 80}
81 81
82EOLIAN static Eo_Base * 82EOLIAN static Efl_Object *
83_efl_event_pointer_eo_base_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) 83_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
84{ 84{
85 eo_constructor(eo_super(obj, MY_CLASS)); 85 efl_constructor(eo_super(obj, MY_CLASS));
86 efl_event_reset(obj); 86 efl_event_reset(obj);
87 return obj; 87 return obj;
88} 88}