X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Factor-impl.h;h=9eb16903fcef0a69d0d56831131bb0362f00412c;hb=2b14556d9c28a96b8b90fff90eedd5563b6d2f14;hp=ccf26449c0925f30d757040a88bc57b16e812a92;hpb=d444e5f35f1fda1faa38b1e6081f2ab69d58d7c0;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index ccf2644..9eb1690 100644
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_ACTOR_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
 #include <dali/internal/event/actors/actor-declarations.h>
-#include <dali/internal/event/actor-attachments/actor-attachment-declarations.h>
 #include <dali/internal/event/common/object-impl.h>
 #include <dali/internal/event/common/stage-def.h>
 #include <dali/internal/event/rendering/renderer-impl.h>
@@ -66,8 +65,8 @@ typedef RendererContainer::iterator RendererIter;
  * Multi-Touch events are received through signals emitted by the actor tree.
  *
  * An Actor is a proxy for a Node in the scene graph.
- * When an Actor is added to the Stage, it creates a node and attaches it to the scene graph.
- * The scene-graph can be updated in a separate thread, so the attachment is done using an asynchronous message.
+ * When an Actor is added to the Stage, it creates a node and connects it to the scene graph.
+ * The scene-graph can be updated in a separate thread, so the connection is done using an asynchronous message.
  * When a tree of Actors is detached from the Stage, a message is sent to destroy the associated nodes.
  */
 class Actor : public Object
@@ -133,21 +132,6 @@ public:
    */
   unsigned int GetId() const;
 
-  // Attachments
-
-  /**
-   * Attach an object to an actor.
-   * @pre The actor does not already have an attachment.
-   * @param[in] attachment The object to attach.
-   */
-  void Attach( ActorAttachment& attachment );
-
-  /**
-   * Retreive the object attached to an actor.
-   * @return The attachment.
-   */
-  ActorAttachmentPtr GetAttachment();
-
   // Containment
 
   /**
@@ -253,7 +237,6 @@ public:
 
   /**
    * Sets the size of an actor.
-   * ActorAttachments attached to the actor, can be scaled to fit within this area.
    * This does not interfere with the actors scale factor.
    * @param [in] width  The new width.
    * @param [in] height The new height.
@@ -262,7 +245,6 @@ public:
 
   /**
    * Sets the size of an actor.
-   * ActorAttachments attached to the actor, can be scaled to fit within this area.
    * This does not interfere with the actors scale factor.
    * @param [in] width The size of the actor along the x-axis.
    * @param [in] height The size of the actor along the y-axis.
@@ -272,7 +254,6 @@ public:
 
   /**
    * Sets the size of an actor.
-   * ActorAttachments attached to the actor, can be scaled to fit within this area.
    * This does not interfere with the actors scale factor.
    * @param [in] size The new size.
    */
@@ -287,7 +268,6 @@ public:
 
   /**
    * Sets the size of an actor.
-   * ActorAttachments attached to the actor, can be scaled to fit within this area.
    * This does not interfere with the actors scale factor.
    * @param [in] size The new size.
    */
@@ -1792,6 +1772,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
@@ -1807,8 +1793,6 @@ protected:
 
   ActorGestureData* mGestureData;   ///< Optional Gesture data. Only created when actor requires gestures
 
-  ActorAttachmentPtr mAttachment;   ///< Optional referenced attachment
-
   // Signals
   Dali::Actor::TouchSignalType             mTouchedSignal;
   Dali::Actor::HoverSignalType             mHoveredSignal;