Merge "Removed On(...)Event()" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 3 Sep 2020 17:23:32 +0000 (17:23 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 3 Sep 2020 17:23:32 +0000 (17:23 +0000)
1  2 
automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.cpp
automated-tests/src/dali/dali-test-suite-utils/test-custom-actor.h
automated-tests/src/dali/utc-Dali-CustomActor.cpp
dali/internal/event/actors/custom-actor-internal.h
dali/public-api/actors/custom-actor-impl.cpp
dali/public-api/actors/custom-actor-impl.h

@@@ -135,12 -135,9 +135,9 @@@ public
    void OnSceneDisconnection() override;
    void OnChildAdd(Dali::Actor& child) override;
    void OnChildRemove(Dali::Actor& child) override;
 -  void OnPropertySet( Dali::Property::Index index, Dali::Property::Value propertyValue ) override;
 +  void OnPropertySet( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) override;
    void OnSizeSet(const Dali::Vector3& targetSize) override;
    void OnSizeAnimation(Dali::Animation& animation, const Dali::Vector3& targetSize) override;
-   bool OnHoverEvent(const Dali::HoverEvent& event) override;
-   bool OnWheelEvent(const Dali::WheelEvent& event) override;
-   bool OnKeyEvent(const Dali::KeyEvent& event) override;
    virtual void OnKeyInputFocusGained();
    virtual void OnKeyInputFocusLost();
    Dali::Vector3 GetNaturalSize() override;