bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=501063eb5cc684abf654daf0aefcebf42f386461
commit 501063eb5cc684abf654daf0aefcebf42f386461 Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 29 14:07:16 2020 -0500 evas/object: remove weird gesture manager method these two objects have zero relation, and I don't know why this ever existed Reviewed-by: Marcel Hollerbach <[email protected]> Differential Revision: https://phab.enlightenment.org/D11243 --- src/lib/evas/Efl_Canvas.h | 2 +- src/lib/evas/canvas/efl_canvas_object.eo | 6 +----- src/lib/evas/canvas/evas_object_main.c | 9 --------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h index 9ef46201bf..3d004c9425 100644 --- a/src/lib/evas/Efl_Canvas.h +++ b/src/lib/evas/Efl_Canvas.h @@ -58,11 +58,11 @@ extern "C" { #include "canvas/efl_input_focus.eo.h" #include "canvas/efl_input_clickable.eo.h" +#include <canvas/efl_canvas_object.eo.h> #include <gesture/efl_canvas_gesture.eo.h> #include <gesture/efl_canvas_gesture_touch.eo.h> #include <gesture/efl_canvas_gesture_recognizer.eo.h> #include <gesture/efl_canvas_gesture_manager.eo.h> -#include <canvas/efl_canvas_object.eo.h> #include <canvas/efl_canvas_alpha_animation.eo.h> #include <canvas/efl_canvas_animation.eo.h> diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index bc02e56197..890462ca7f 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -11,7 +11,7 @@ struct Efl.Event_Animator_Tick { abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Input.Interface, Efl.Gfx.Hint, - Efl.Gfx.Mapping, Efl.Canvas.Pointer, Efl.Canvas.Gesture_Events, Efl.Canvas.Object_Animation + Efl.Gfx.Mapping, Efl.Canvas.Pointer, Efl.Canvas.Object_Animation { [[Efl canvas object abstract class @@ -483,10 +483,6 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, return: bool; [[$true if the coordinates are inside the object, $false otherwise]] } } - gesture_manager_get @beta { - [[Returns current canvas's gesture manager]] - return: const(Efl.Canvas.Gesture_Manager); [[The gesture manager]] - } } implements { Efl.Object.constructor; diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index f01ab01e41..eff1188eb0 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -242,15 +242,6 @@ end: return efl_finalize(efl_super(eo_obj, MY_CLASS)); } -EOLIAN const Efl_Canvas_Gesture_Manager * -_efl_canvas_object_gesture_manager_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *pd) -{ - if (!pd->layer || !pd->layer->evas) - return NULL; - - return (pd->layer->evas)->gesture_manager; -} - void evas_object_change_reset(Evas_Object_Protected_Data *obj) { --
