Added class to replace TouchEvent

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / actor-impl.h

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 1a23242..920cc1f 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -39,7 +39,7 @@ namespace Dali
 {
 
 struct KeyEvent;
-struct TouchEvent;
+class TouchData;
 struct HoverEvent;
 struct WheelEvent;
 
@@ -1358,10 +1358,11 @@ public:
 
   /**
    * Used by the EventProcessor to emit touch event signals.
-   * @param[in] event The touch event.
+   * @param[in] event The touch event (Old API).
+   * @param[in] touch The touch data.
    * @return True if the event was consumed.
    */
-  bool EmitTouchEventSignal( const TouchEvent& event );
+  bool EmitTouchEventSignal( const TouchEvent& event, const Dali::TouchData& touch );
 
   /**
    * Used by the EventProcessor to emit hover event signals.
@@ -1383,6 +1384,11 @@ public:
   Dali::Actor::TouchSignalType& TouchedSignal();
 
   /**
+   * @copydoc Dali::Actor::TouchEventSignal()
+   */
+  Dali::Actor::TouchDataSignalType& TouchSignal();
+
+  /**
    * @copydoc Dali::Actor::HoveredSignal()
    */
   Dali::Actor::HoverSignalType& HoveredSignal();
@@ -1772,6 +1778,12 @@ private:
    */
   Vector2 ApplySizeSetPolicy( const Vector2 size );
 
+  /**
+   * Retrieve the parent object of an Actor.
+   * @return The parent object, or NULL if the Actor does not have a parent.
+   */
+  virtual Object* GetParentObject() const;
+
 protected:
 
   Actor* mParent;                 ///< Each actor (except the root) can have one parent
@@ -1789,6 +1801,7 @@ protected:
 
   // Signals
   Dali::Actor::TouchSignalType             mTouchedSignal;
+  Dali::Actor::TouchDataSignalType         mTouchSignal;
   Dali::Actor::HoverSignalType             mHoveredSignal;
   Dali::Actor::WheelEventSignalType        mWheelEventSignal;
   Dali::Actor::OnStageSignalType           mOnStageSignal;