Merge "Removed On(...)Event()" into devel/master

diff --combined dali-toolkit/public-api/controls/control-impl.cpp
index f1e8918,4916474..feccaeb
--- 1/dali-toolkit/public-api/controls/control-impl.cpp
--- 2/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@@ -596,7 -596,7 +596,7 @@@ void Control::OnChildRemove(Actor& chil
  {
  }
  
 -void Control::OnPropertySet( Property::Index index, Property::Value propertyValue )
 +void Control::OnPropertySet( Property::Index index, const Property::Value& propertyValue )
  {
    // If the clipping mode has been set, we may need to create a renderer.
    // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls.
@@@ -622,19 -622,9 +622,9 @@@ void Control::OnSizeAnimation(Animation
    // @todo size negotiate background to new size, animate as well?
  }
  
- bool Control::OnHoverEvent(const HoverEvent& event)
- {
-   return false; // Do not consume
- }
- 
  bool Control::OnKeyEvent(const KeyEvent& event)
  {
    return false; // Do not consume
- }
- 
- bool Control::OnWheelEvent(const WheelEvent& event)
- {
-   return false; // Do not consume
  }
  
  void Control::OnRelayout( const Vector2& size, RelayoutContainer& container )

diff --combined dali-toolkit/public-api/controls/control-impl.h
index 9b80f69,745d444..db7d997
--- 1/dali-toolkit/public-api/controls/control-impl.h
--- 2/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@@ -324,7 -324,7 +324,7 @@@ protected: // From CustomActorImp
     * @copydoc CustomActorImpl::OnPropertySet()
     * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end.
     */
 -  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override;
 +  void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override;
  
    /**
     * @copydoc CustomActorImpl::OnSizeSet()
@@@ -339,21 -339,6 +339,6 @@@
    virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize ) override;
  
    /**
-    * @copydoc CustomActorImpl::OnHoverEvent()
-    */
-   virtual bool OnHoverEvent( const HoverEvent& event ) override;
- 
-   /**
-    * @copydoc CustomActorImpl::OnKeyEvent()
-    */
-   virtual bool OnKeyEvent( const KeyEvent& event ) override;
- 
-   /**
-    * @copydoc CustomActorImpl::OnWheelEvent()
-    */
-   virtual bool OnWheelEvent( const WheelEvent& event ) override;
- 
-   /**
     * @copydoc CustomActorImpl::OnRelayout()
     */
    virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
@@@ -546,6 -531,15 +531,15 @@@ public: // API for derived classes to o
     */
    virtual bool OnKeyboardEnter();
  
+   /**
+    * @brief Called after a key-event is received by the actor that has had its focus set.
+    *
+    * @SINCE_1_0.0
+    * @param[in] event The Key Event
+    * @return True if the event should be consumed
+    */
+   virtual bool OnKeyEvent( const KeyEvent& event );
+ 
    // Gestures
  
    /**