From 680d6d1a7dae46c73b2313cd0692711c9f4e8117 Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Mon, 6 Mar 2023 12:47:18 +0100
Subject: [PATCH] refactor(event): use lv_event_get_orignal_target instead of
 current_target

---
 demos/keypad_encoder/lv_demo_keypad_encoder.c |  2 +-
 .../keypad_encoder/lv_demo_keypad_encoder.py  |  2 +-
 demos/widgets/lv_demo_widgets.c               |  2 +-
 demos/widgets/lv_demo_widgets.py              |  2 +-
 examples/event/lv_example_event_3.c           |  4 ++--
 .../others/gridnav/lv_example_gridnav_3.c     |  2 +-
 .../others/gridnav/lv_example_gridnav_3.py    |  2 +-
 .../widgets/calendar/lv_example_calendar_1.c  |  2 +-
 .../widgets/calendar/lv_example_calendar_1.py |  2 +-
 .../widgets/checkbox/lv_example_checkbox_2.c  |  4 ++--
 .../widgets/checkbox/lv_example_checkbox_2.py |  4 ++--
 examples/widgets/msgbox/lv_example_msgbox_1.c |  2 +-
 src/core/lv_disp.c                            |  2 +-
 src/core/lv_obj.c                             |  2 +-
 src/core/lv_obj_event.c                       | 22 +++++++++----------
 src/core/lv_obj_event.h                       | 10 ++++-----
 src/misc/lv_event.c                           |  6 ++---
 src/misc/lv_event.h                           |  4 ++--
 src/others/gridnav/lv_gridnav.c               |  2 +-
 src/widgets/arc/lv_arc.c                      |  2 +-
 src/widgets/bar/lv_bar.c                      |  2 +-
 src/widgets/btnmatrix/lv_btnmatrix.c          |  2 +-
 src/widgets/chart/lv_chart.c                  |  2 +-
 src/widgets/checkbox/lv_checkbox.c            |  2 +-
 src/widgets/colorwheel/lv_colorwheel.c        |  2 +-
 src/widgets/dropdown/lv_dropdown.c            |  6 ++---
 src/widgets/img/lv_img.c                      |  4 ++--
 src/widgets/imgbtn/lv_imgbtn.c                |  2 +-
 src/widgets/label/lv_label.c                  |  2 +-
 src/widgets/led/lv_led.c                      |  2 +-
 src/widgets/line/lv_line.c                    |  2 +-
 src/widgets/meter/lv_meter.c                  |  2 +-
 src/widgets/objx_templ/lv_objx_templ.c        |  2 +-
 src/widgets/roller/lv_roller.c                |  4 ++--
 src/widgets/slider/lv_slider.c                |  2 +-
 src/widgets/span/lv_span.c                    |  2 +-
 src/widgets/spinbox/lv_spinbox.c              |  2 +-
 src/widgets/switch/lv_switch.c                |  2 +-
 src/widgets/table/lv_table.c                  |  2 +-
 src/widgets/tabview/lv_tabview.c              |  2 +-
 src/widgets/textarea/lv_textarea.c            |  2 +-
 41 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/demos/keypad_encoder/lv_demo_keypad_encoder.c b/demos/keypad_encoder/lv_demo_keypad_encoder.c
index 1b55bca10..b09154e12 100644
--- a/demos/keypad_encoder/lv_demo_keypad_encoder.c
+++ b/demos/keypad_encoder/lv_demo_keypad_encoder.c
@@ -179,7 +179,7 @@ static void msgbox_create(void)
 static void msgbox_event_cb(lv_event_t * e)
 {
     lv_event_code_t code = lv_event_get_code(e);
-    lv_obj_t * msgbox = lv_event_get_current_target(e);
+    lv_obj_t * msgbox = lv_event_get_target(e);
 
     if(code == LV_EVENT_VALUE_CHANGED) {
         const char * txt = lv_msgbox_get_active_btn_text(msgbox);
diff --git a/demos/keypad_encoder/lv_demo_keypad_encoder.py b/demos/keypad_encoder/lv_demo_keypad_encoder.py
index 843da5509..967e2b8f9 100644
--- a/demos/keypad_encoder/lv_demo_keypad_encoder.py
+++ b/demos/keypad_encoder/lv_demo_keypad_encoder.py
@@ -118,7 +118,7 @@ class KeyboardEncoder:
     def msgbox_event_cb(self,e):
 
         code = e.get_code();
-        msgbox = e.get_current_target()
+        msgbox = e.get_target()
 
         if code == lv.EVENT.VALUE_CHANGED:
             txt = msgbox.get_active_btn_text()
diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c
index a42efc5c9..f49f5f8ed 100644
--- a/demos/widgets/lv_demo_widgets.c
+++ b/demos/widgets/lv_demo_widgets.c
@@ -1254,7 +1254,7 @@ static void calendar_event_cb(lv_event_t * e)
 {
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * ta = lv_event_get_user_data(e);
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_target(e);
     if(code == LV_EVENT_VALUE_CHANGED) {
         lv_calendar_date_t d;
         lv_calendar_get_pressed_date(obj, &d);
diff --git a/demos/widgets/lv_demo_widgets.py b/demos/widgets/lv_demo_widgets.py
index 3558fdf42..d76141553 100755
--- a/demos/widgets/lv_demo_widgets.py
+++ b/demos/widgets/lv_demo_widgets.py
@@ -1314,7 +1314,7 @@ def birthday_event_cb(e):
 def calendar_event_cb(e,ta) :
     global calendar
     code = e.get_code()
-    obj = lv.calendar.__cast__(e.get_current_target())
+    obj = lv.calendar.__cast__(e.get_target())
     if code == lv.EVENT.VALUE_CHANGED:
         d = lv.calendar_date_t()
         obj.get_pressed_date(d)
diff --git a/examples/event/lv_example_event_3.c b/examples/event/lv_example_event_3.c
index e4d303f13..163220370 100644
--- a/examples/event/lv_example_event_3.c
+++ b/examples/event/lv_example_event_3.c
@@ -4,10 +4,10 @@
 static void event_cb(lv_event_t * e)
 {
     /*The original target of the event. Can be the buttons or the container*/
-    lv_obj_t * target = lv_event_get_target(e);
+    lv_obj_t * target = lv_event_get_original_target(e);
 
     /*The current target is always the container as the event is added to it*/
-    lv_obj_t * cont = lv_event_get_current_target(e);
+    lv_obj_t * cont = lv_event_get_target(e);
 
     /*If container was clicked do nothing*/
     if(target == cont) return;
diff --git a/examples/others/gridnav/lv_example_gridnav_3.c b/examples/others/gridnav/lv_example_gridnav_3.c
index 76cb885e9..cc7e485bc 100644
--- a/examples/others/gridnav/lv_example_gridnav_3.c
+++ b/examples/others/gridnav/lv_example_gridnav_3.c
@@ -4,7 +4,7 @@
 static void cont_sub_event_cb(lv_event_t * e)
 {
     uint32_t k = lv_event_get_key(e);
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_target(e);
     if(k == LV_KEY_ENTER) {
         lv_group_focus_obj(obj);
     }
diff --git a/examples/others/gridnav/lv_example_gridnav_3.py b/examples/others/gridnav/lv_example_gridnav_3.py
index 4ceb12d24..43c4b1407 100644
--- a/examples/others/gridnav/lv_example_gridnav_3.py
+++ b/examples/others/gridnav/lv_example_gridnav_3.py
@@ -1,6 +1,6 @@
 def cont_sub_event_cb(e):
     k = e.get_key()
-    obj = e.get_current_target()
+    obj = e.get_target_obj()
     if k == lv.KEY.ENTER:
         lv.group_focus_obj(obj)
 
diff --git a/examples/widgets/calendar/lv_example_calendar_1.c b/examples/widgets/calendar/lv_example_calendar_1.c
index 4431bc03f..4c050fdf7 100644
--- a/examples/widgets/calendar/lv_example_calendar_1.c
+++ b/examples/widgets/calendar/lv_example_calendar_1.c
@@ -4,7 +4,7 @@
 static void event_handler(lv_event_t * e)
 {
     lv_event_code_t code = lv_event_get_code(e);
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_target(e);
 
     if(code == LV_EVENT_VALUE_CHANGED) {
         lv_calendar_date_t date;
diff --git a/examples/widgets/calendar/lv_example_calendar_1.py b/examples/widgets/calendar/lv_example_calendar_1.py
index 9720f80e4..392491829 100644
--- a/examples/widgets/calendar/lv_example_calendar_1.py
+++ b/examples/widgets/calendar/lv_example_calendar_1.py
@@ -3,7 +3,7 @@ def event_handler(e):
     code = e.get_code()
 
     if code == lv.EVENT.VALUE_CHANGED:
-        source = e.get_current_target_obj()
+        source = e.get_target_obj()
         date = lv.calendar_date_t()
         if source.get_pressed_date(date) == lv.RES.OK:
             calendar.set_today_date(date.year, date.month, date.day)
diff --git a/examples/widgets/checkbox/lv_example_checkbox_2.c b/examples/widgets/checkbox/lv_example_checkbox_2.c
index 70056d44e..93c1b33bc 100644
--- a/examples/widgets/checkbox/lv_example_checkbox_2.c
+++ b/examples/widgets/checkbox/lv_example_checkbox_2.c
@@ -9,8 +9,8 @@ static uint32_t active_index_2 = 0;
 static void radio_event_handler(lv_event_t * e)
 {
     uint32_t * active_id = lv_event_get_user_data(e);
-    lv_obj_t * cont = lv_event_get_current_target(e);
-    lv_obj_t * act_cb = lv_event_get_target(e);
+    lv_obj_t * cont = lv_event_get_target(e);
+    lv_obj_t * act_cb = lv_event_get_original_target(e);
     lv_obj_t * old_cb = lv_obj_get_child(cont, *active_id);
 
     /*Do nothing if the container was clicked*/
diff --git a/examples/widgets/checkbox/lv_example_checkbox_2.py b/examples/widgets/checkbox/lv_example_checkbox_2.py
index f6f9ca01d..76452c20c 100644
--- a/examples/widgets/checkbox/lv_example_checkbox_2.py
+++ b/examples/widgets/checkbox/lv_example_checkbox_2.py
@@ -49,8 +49,8 @@ class LV_Example_Checkbox_2:
 
 
     def radio_event_handler(self,e):
-        cont = e.get_current_target_obj()
-        act_cb = e.get_target_obj()
+        cont = e.get_target_obj()
+        act_cb = e.get_original_target_obj()
         if cont == self.cont1:
             active_id = self.active_index_1
         else:
diff --git a/examples/widgets/msgbox/lv_example_msgbox_1.c b/examples/widgets/msgbox/lv_example_msgbox_1.c
index 147d4ee0a..1299ca0dd 100644
--- a/examples/widgets/msgbox/lv_example_msgbox_1.c
+++ b/examples/widgets/msgbox/lv_example_msgbox_1.c
@@ -3,7 +3,7 @@
 
 static void event_cb(lv_event_t * e)
 {
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_target(e);
     LV_UNUSED(obj);
     LV_LOG_USER("Button %s clicked", lv_msgbox_get_active_btn_text(obj));
 }
diff --git a/src/core/lv_disp.c b/src/core/lv_disp.c
index c5a0f5fb4..c0f7bc5ad 100644
--- a/src/core/lv_disp.c
+++ b/src/core/lv_disp.c
@@ -735,7 +735,7 @@ lv_res_t lv_disp_send_event(lv_disp_t * disp, lv_event_code_t code, void * user_
     lv_memzero(&e, sizeof(e));
     e.code = code;
     e.target = disp;
-    e.current_target = disp;
+    e.original_target = disp;
     e.param = user_data;
     lv_res_t res;
     res = lv_event_send(&disp->event_list, &e, true);
diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c
index e6defaccb..f4cc9d2e8 100644
--- a/src/core/lv_obj.c
+++ b/src/core/lv_obj.c
@@ -791,7 +791,7 @@ static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e)
     LV_UNUSED(class_p);
 
     lv_event_code_t code = lv_event_get_code(e);
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_original_target(e);
     if(code == LV_EVENT_PRESSED) {
         lv_obj_add_state(obj, LV_STATE_PRESSED);
     }
diff --git a/src/core/lv_obj_event.c b/src/core/lv_obj_event.c
index 19f0e71d7..8f02acd07 100644
--- a/src/core/lv_obj_event.c
+++ b/src/core/lv_obj_event.c
@@ -55,7 +55,7 @@ lv_res_t lv_obj_send_event(lv_obj_t * obj, lv_event_code_t event_code, void * pa
 
     lv_event_t e;
     e.target = obj;
-    e.current_target = obj;
+    e.original_target = obj;
     e.code = event_code;
     e.user_data = NULL;
     e.param = param;
@@ -75,10 +75,10 @@ lv_res_t lv_obj_send_event(lv_obj_t * obj, lv_event_code_t event_code, void * pa
 }
 
 
-lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
+lv_res_t lv_event_base(const lv_obj_class_t * class_p, lv_event_t * e)
 {
     const lv_obj_class_t * base;
-    if(class_p == NULL) base = ((lv_obj_t *)e->current_target)->class_p;
+    if(class_p == NULL) base = ((lv_obj_t *)e->target)->class_p;
     else base = class_p->base_class;
 
     /*Find a base in which call the ancestor's event handler_cb if set*/
@@ -134,9 +134,9 @@ lv_obj_t * lv_event_get_target_obj(lv_event_t * e)
     return lv_event_get_target(e);
 }
 
-lv_obj_t * lv_event_get_current_target_obj(lv_event_t * e)
+lv_obj_t * lv_event_get_original_target_obj(lv_event_t * e)
 {
-    return lv_event_get_current_target(e);
+    return lv_event_get_original_target(e);
 }
 
 
@@ -292,7 +292,7 @@ void lv_event_set_cover_res(lv_event_t * e, lv_cover_res_t res)
 
 static lv_res_t event_send_core(lv_event_t * e)
 {
-    EVENT_TRACE("Sending event %d to %p with %p param", e->code, (void *)e->current_target, e->param);
+    EVENT_TRACE("Sending event %d to %p with %p param", e->code, (void *)e->original_target, e->param);
 
     /*Call the input device's feedback callback if set*/
     lv_indev_t * indev_act = lv_indev_get_act();
@@ -302,22 +302,22 @@ static lv_res_t event_send_core(lv_event_t * e)
         if(e->deleted) return LV_RES_INV;
     }
 
-    lv_obj_t * target = e->current_target;
+    lv_obj_t * target = e->target;
     lv_res_t res = LV_RES_OK;
     lv_event_list_t * list = target->spec_attr ?  &target->spec_attr->event_list : NULL;
 
     res = lv_event_send(list, e, true);
     if(res != LV_RES_OK) return res;
 
-    res = lv_obj_event_base(NULL, e);
+    res = lv_event_base(NULL, e);
     if(res != LV_RES_OK) return res;
 
     res = lv_event_send(list, e, false);
     if(res != LV_RES_OK) return res;
 
-    lv_obj_t * parent = lv_obj_get_parent(e->current_target);
+    lv_obj_t * parent = lv_obj_get_parent(e->target);
     if(parent && event_is_bubbled(e)) {
-        e->current_target = parent;
+        e->target = parent;
         res = event_send_core(e);
         if(res != LV_RES_OK) return res;
     }
@@ -340,7 +340,7 @@ static bool event_is_bubbled(lv_event_t * e)
     }
 
     /*Check other codes only if bubbling is enabled*/
-    if(lv_obj_has_flag(e->current_target, LV_OBJ_FLAG_EVENT_BUBBLE) == false) return false;
+    if(lv_obj_has_flag(e->target, LV_OBJ_FLAG_EVENT_BUBBLE) == false) return false;
 
     switch(e->code) {
         case LV_EVENT_HIT_TEST:
diff --git a/src/core/lv_obj_event.h b/src/core/lv_obj_event.h
index 68c599a25..ac944bfe8 100644
--- a/src/core/lv_obj_event.h
+++ b/src/core/lv_obj_event.h
@@ -71,19 +71,19 @@ lv_res_t lv_obj_send_event(struct _lv_obj_t * obj, lv_event_code_t event_code, v
 lv_res_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e);
 
 /**
- * Get the object originally targeted by the event. It's the same even if the event is bubbled.
+ * Get the current target of the event. It's the object which event handler being called.
+ * If the event is not bubbled it's the same as "orignal" target.
  * @param e     pointer to the event descriptor
  * @return      the target of the event_code
  */
 struct _lv_obj_t * lv_event_get_target_obj(lv_event_t * e);
 
 /**
- * Get the current target of the event. It's the object which event handler being called.
- * If the event is not bubbled it's the same as "normal" target.
+ * Get the object originally targeted by the event. It's the same even if the event is bubbled.
  * @param e     pointer to the event descriptor
- * @return      pointer to the current target of the event_code
+ * @return      pointer to the original target of the event_code
  */
-struct _lv_obj_t * lv_event_get_current_target_obj(lv_event_t * e);
+struct _lv_obj_t * lv_event_get_original_target_obj(lv_event_t * e);
 
 /**
  * Add an event handler function for an object.
diff --git a/src/misc/lv_event.c b/src/misc/lv_event.c
index a99b5bc35..553e81ff3 100644
--- a/src/misc/lv_event.c
+++ b/src/misc/lv_event.c
@@ -146,9 +146,9 @@ void * lv_event_get_target(lv_event_t * e)
     return e->target;
 }
 
-void * lv_event_get_current_target(lv_event_t * e)
+void * lv_event_get_original_target(lv_event_t * e)
 {
-    return e->current_target;
+    return e->original_target;
 }
 
 lv_event_code_t lv_event_get_code(lv_event_t * e)
@@ -188,7 +188,7 @@ void _lv_event_mark_deleted(void * target)
     lv_event_t * e = event_head;
 
     while(e) {
-        if(e->current_target == target || e->target == target) e->deleted = 1;
+        if(e->original_target == target || e->target == target) e->deleted = 1;
         e = e->prev;
     }
 }
diff --git a/src/misc/lv_event.h b/src/misc/lv_event.h
index bd0f807b0..1625419f8 100644
--- a/src/misc/lv_event.h
+++ b/src/misc/lv_event.h
@@ -115,7 +115,7 @@ typedef struct {
 
 typedef struct _lv_event_t {
     void * target;
-    void * current_target;
+    void * original_target;
     lv_event_code_t code;
     void * user_data;
     void * param;
@@ -168,7 +168,7 @@ void * lv_event_get_target(lv_event_t * e);
  * @param e     pointer to the event descriptor
  * @return      pointer to the current target of the event_code
  */
-void * lv_event_get_current_target(lv_event_t * e);
+void * lv_event_get_original_target(lv_event_t * e);
 
 /**
  * Get the event code of an event
diff --git a/src/others/gridnav/lv_gridnav.c b/src/others/gridnav/lv_gridnav.c
index e799adde5..211e0760a 100644
--- a/src/others/gridnav/lv_gridnav.c
+++ b/src/others/gridnav/lv_gridnav.c
@@ -132,7 +132,7 @@ void lv_gridnav_set_focused(lv_obj_t * cont, lv_obj_t * to_focus, lv_anim_enable
 
 static void gridnav_event_cb(lv_event_t * e)
 {
-    lv_obj_t * obj = lv_event_get_current_target(e);
+    lv_obj_t * obj = lv_event_get_original_target(e);
     lv_gridnav_dsc_t * dsc = lv_event_get_user_data(e);
     lv_event_code_t code = lv_event_get_code(e);
 
diff --git a/src/widgets/arc/lv_arc.c b/src/widgets/arc/lv_arc.c
index b6cfbfcf4..1e6460fe5 100644
--- a/src/widgets/arc/lv_arc.c
+++ b/src/widgets/arc/lv_arc.c
@@ -434,7 +434,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/bar/lv_bar.c b/src/widgets/bar/lv_bar.c
index 37af845f5..4d9f41b83 100644
--- a/src/widgets/bar/lv_bar.c
+++ b/src/widgets/bar/lv_bar.c
@@ -532,7 +532,7 @@ static void lv_bar_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/btnmatrix/lv_btnmatrix.c b/src/widgets/btnmatrix/lv_btnmatrix.c
index dde68148d..c2ef6179f 100644
--- a/src/widgets/btnmatrix/lv_btnmatrix.c
+++ b/src/widgets/btnmatrix/lv_btnmatrix.c
@@ -390,7 +390,7 @@ static void lv_btnmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/chart/lv_chart.c b/src/widgets/chart/lv_chart.c
index 55b7932a2..2deaf10aa 100644
--- a/src/widgets/chart/lv_chart.c
+++ b/src/widgets/chart/lv_chart.c
@@ -722,7 +722,7 @@ static void lv_chart_event(const lv_obj_class_t * class_p, lv_event_t * e)
     /*Call the ancestor's event handler*/
     lv_res_t res;
 
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/checkbox/lv_checkbox.c b/src/widgets/checkbox/lv_checkbox.c
index 394908cb4..6dcd040ec 100644
--- a/src/widgets/checkbox/lv_checkbox.c
+++ b/src/widgets/checkbox/lv_checkbox.c
@@ -150,7 +150,7 @@ static void lv_checkbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
     lv_res_t res;
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/colorwheel/lv_colorwheel.c b/src/widgets/colorwheel/lv_colorwheel.c
index e43c3045a..7313c3624 100644
--- a/src/widgets/colorwheel/lv_colorwheel.c
+++ b/src/widgets/colorwheel/lv_colorwheel.c
@@ -358,7 +358,7 @@ static void lv_colorwheel_event(const lv_obj_class_t * class_p, lv_event_t * e)
     LV_UNUSED(class_p);
 
     /*Call the ancestor's event handler*/
-    lv_res_t res = lv_obj_event_base(MY_CLASS, e);
+    lv_res_t res = lv_event_base(MY_CLASS, e);
 
     if(res != LV_RES_OK) return;
 
diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c
index 9ec37670e..c319883f3 100644
--- a/src/widgets/dropdown/lv_dropdown.c
+++ b/src/widgets/dropdown/lv_dropdown.c
@@ -651,7 +651,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
@@ -743,7 +743,7 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t *
     /*Call the ancestor's event handler*/
     lv_event_code_t code = lv_event_get_code(e);
     if(code != LV_EVENT_DRAW_POST) {
-        res = lv_obj_event_base(MY_CLASS_LIST, e);
+        res = lv_event_base(MY_CLASS_LIST, e);
         if(res != LV_RES_OK) return;
     }
     lv_obj_t * list = lv_event_get_target(e);
@@ -764,7 +764,7 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t *
     }
     else if(code == LV_EVENT_DRAW_POST) {
         draw_list(e);
-        res = lv_obj_event_base(MY_CLASS_LIST, e);
+        res = lv_event_base(MY_CLASS_LIST, e);
         if(res != LV_RES_OK) return;
     }
 }
diff --git a/src/widgets/img/lv_img.c b/src/widgets/img/lv_img.c
index 3aaa27761..703c7c9f4 100644
--- a/src/widgets/img/lv_img.c
+++ b/src/widgets/img/lv_img.c
@@ -443,7 +443,7 @@ static void lv_img_event(const lv_obj_class_t * class_p, lv_event_t * e)
     /*Ancestor events will be called during drawing*/
     if(code != LV_EVENT_DRAW_MAIN && code != LV_EVENT_DRAW_POST) {
         /*Call the ancestor's event handler*/
-        lv_res_t res = lv_obj_event_base(MY_CLASS, e);
+        lv_res_t res = lv_event_base(MY_CLASS, e);
         if(res != LV_RES_OK) return;
     }
 
@@ -602,7 +602,7 @@ static void draw_img(lv_event_t * e)
         lv_area_copy(&ori_coords, &obj->coords);
         lv_area_copy(&obj->coords, &bg_coords);
 
-        lv_res_t res = lv_obj_event_base(MY_CLASS, e);
+        lv_res_t res = lv_event_base(MY_CLASS, e);
         if(res != LV_RES_OK) return;
 
         lv_area_copy(&obj->coords, &ori_coords);
diff --git a/src/widgets/imgbtn/lv_imgbtn.c b/src/widgets/imgbtn/lv_imgbtn.c
index c64197415..5da477be6 100644
--- a/src/widgets/imgbtn/lv_imgbtn.c
+++ b/src/widgets/imgbtn/lv_imgbtn.c
@@ -178,7 +178,7 @@ static void lv_imgbtn_event(const lv_obj_class_t * class_p, lv_event_t * e)
 {
     LV_UNUSED(class_p);
 
-    lv_res_t res = lv_obj_event_base(&lv_imgbtn_class, e);
+    lv_res_t res = lv_event_base(&lv_imgbtn_class, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c
index a106c075e..eff754d4c 100644
--- a/src/widgets/label/lv_label.c
+++ b/src/widgets/label/lv_label.c
@@ -699,7 +699,7 @@ static void lv_label_event(const lv_obj_class_t * class_p, lv_event_t * e)
     LV_UNUSED(class_p);
 
     /*Call the ancestor's event handler*/
-    const lv_res_t res = lv_obj_event_base(MY_CLASS, e);
+    const lv_res_t res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     const lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/led/lv_led.c b/src/widgets/led/lv_led.c
index 2c5a61e95..26b67b40f 100644
--- a/src/widgets/led/lv_led.c
+++ b/src/widgets/led/lv_led.c
@@ -166,7 +166,7 @@ static void lv_led_event(const lv_obj_class_t * class_p, lv_event_t * e)
     /* Call the ancestor's event handler */
     lv_event_code_t code = lv_event_get_code(e);
     if(code != LV_EVENT_DRAW_MAIN && code != LV_EVENT_DRAW_MAIN_END) {
-        res = lv_obj_event_base(MY_CLASS, e);
+        res = lv_event_base(MY_CLASS, e);
         if(res != LV_RES_OK) return;
     }
 
diff --git a/src/widgets/line/lv_line.c b/src/widgets/line/lv_line.c
index 6c1ca9a36..f5d2c7cfd 100644
--- a/src/widgets/line/lv_line.c
+++ b/src/widgets/line/lv_line.c
@@ -138,7 +138,7 @@ static void lv_line_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/meter/lv_meter.c b/src/widgets/meter/lv_meter.c
index 9e914c8b6..c48f51113 100644
--- a/src/widgets/meter/lv_meter.c
+++ b/src/widgets/meter/lv_meter.c
@@ -277,7 +277,7 @@ static void lv_meter_event(const lv_obj_class_t * class_p, lv_event_t * e)
 {
     LV_UNUSED(class_p);
 
-    lv_res_t res = lv_obj_event_base(MY_CLASS, e);
+    lv_res_t res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/objx_templ/lv_objx_templ.c b/src/widgets/objx_templ/lv_objx_templ.c
index 91565466a..ad7b75a3e 100644
--- a/src/widgets/objx_templ/lv_objx_templ.c
+++ b/src/widgets/objx_templ/lv_objx_templ.c
@@ -127,7 +127,7 @@ static void lv_templ_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = LV_EVENT_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     /*Add the widget specific event handling here*/
diff --git a/src/widgets/roller/lv_roller.c b/src/widgets/roller/lv_roller.c
index ec7ddc8b4..925a85fcb 100644
--- a/src/widgets/roller/lv_roller.c
+++ b/src/widgets/roller/lv_roller.c
@@ -326,7 +326,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     const lv_event_code_t code = lv_event_get_code(e);
@@ -432,7 +432,7 @@ static void lv_roller_label_event(const lv_obj_class_t * class_p, lv_event_t * e
     /*LV_EVENT_DRAW_MAIN will be called in the draw function*/
     if(code != LV_EVENT_DRAW_MAIN) {
         /* Call the ancestor's event handler */
-        res = lv_obj_event_base(MY_CLASS_LABEL, e);
+        res = lv_event_base(MY_CLASS_LABEL, e);
         if(res != LV_RES_OK) return;
     }
 
diff --git a/src/widgets/slider/lv_slider.c b/src/widgets/slider/lv_slider.c
index 460d9446b..e90fccab1 100644
--- a/src/widgets/slider/lv_slider.c
+++ b/src/widgets/slider/lv_slider.c
@@ -102,7 +102,7 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/span/lv_span.c b/src/widgets/span/lv_span.c
index a8a1d111c..d2f5ffc01 100644
--- a/src/widgets/span/lv_span.c
+++ b/src/widgets/span/lv_span.c
@@ -533,7 +533,7 @@ static void lv_spangroup_event(const lv_obj_class_t * class_p, lv_event_t * e)
     LV_UNUSED(class_p);
 
     /* Call the ancestor's event handler */
-    if(lv_obj_event_base(MY_CLASS, e) != LV_RES_OK) return;
+    if(lv_event_base(MY_CLASS, e) != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * obj = lv_event_get_target(e);
diff --git a/src/widgets/spinbox/lv_spinbox.c b/src/widgets/spinbox/lv_spinbox.c
index d3afe1fca..9f0799653 100644
--- a/src/widgets/spinbox/lv_spinbox.c
+++ b/src/widgets/spinbox/lv_spinbox.c
@@ -364,7 +364,7 @@ static void lv_spinbox_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
     /*Call the ancestor's event handler*/
     lv_res_t res = LV_RES_OK;
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     const lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/switch/lv_switch.c b/src/widgets/switch/lv_switch.c
index eb4f1e2cd..e5efa1538 100644
--- a/src/widgets/switch/lv_switch.c
+++ b/src/widgets/switch/lv_switch.c
@@ -113,7 +113,7 @@ static void lv_switch_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c
index 0d7c56a1f..be56a7b94 100644
--- a/src/widgets/table/lv_table.c
+++ b/src/widgets/table/lv_table.c
@@ -459,7 +459,7 @@ static void lv_table_event(const lv_obj_class_t * class_p, lv_event_t * e)
     lv_res_t res;
 
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/tabview/lv_tabview.c b/src/widgets/tabview/lv_tabview.c
index b87e07048..73b08bbc1 100644
--- a/src/widgets/tabview/lv_tabview.c
+++ b/src/widgets/tabview/lv_tabview.c
@@ -290,7 +290,7 @@ static void lv_tabview_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj
 static void lv_tabview_event(const lv_obj_class_t * class_p, lv_event_t * e)
 {
     LV_UNUSED(class_p);
-    lv_res_t res = lv_obj_event_base(&lv_tabview_class, e);
+    lv_res_t res = lv_event_base(&lv_tabview_class, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);
diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c
index f7f72921f..143d8cb10 100644
--- a/src/widgets/textarea/lv_textarea.c
+++ b/src/widgets/textarea/lv_textarea.c
@@ -877,7 +877,7 @@ static void lv_textarea_event(const lv_obj_class_t * class_p, lv_event_t * e)
 
     lv_res_t res;
     /*Call the ancestor's event handler*/
-    res = lv_obj_event_base(MY_CLASS, e);
+    res = lv_event_base(MY_CLASS, e);
     if(res != LV_RES_OK) return;
 
     lv_event_code_t code = lv_event_get_code(e);