X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fcluster%2Fcluster-impl.h;h=863417f649a39a75a90c65167e17d25eb6235a14;hp=bd33da96bd411ba412eee274f4d1cefb9c127be2;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=a881757839b7abb008873a68c67e17b3ba39669b diff --git a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h index bd33da9..863417f 100644 --- a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h +++ b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h @@ -69,7 +69,7 @@ typedef ChildInfoContainer::const_iterator ChildInfoConstIter; * Multiple cluster styles may be provided, to determine the position, size, rotation, scale, color and visibility * of the child actors in the cluster. */ -class Cluster : public ControlImpl +class Cluster : public Control { public: @@ -231,9 +231,9 @@ private: */ void DoTransformAction(const PropertyValueContainer& attributes); -private: // From ControlImpl +private: // From Control /** - * From Toolkit::ControlImpl; called shortly before a child is removed from the owning actor. + * From Control; called shortly before a child is removed from the owning actor. * @param[in] child The child being removed.Ptr */ virtual void OnControlChildRemove(Actor& child); @@ -249,7 +249,7 @@ public: */ static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); -private: // From ControlImpl +private: // From Control /** * @copydoc Toolkit::Control::OnInitialize()