X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fflex-container%2Fflex-container-impl.h;h=ce09e23b994ac58c3cfe7dc25c9a991f625c063f;hp=2005f9cb5af8988dbf5c9cb7d911c8264701ad58;hb=1e7f2e72fcc37576c754ca2ed563ece458942960;hpb=1dbb50c7c99eef4f1771787bbf97bbb023a49c91 diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h index 2005f9c..ce09e23 100644 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -26,7 +26,7 @@ #include extern "C" { -#include "layout.h" +#include } namespace Dali @@ -205,11 +205,6 @@ private: // From Control */ virtual void OnSizeSet( const Vector3& size ); - /** - * @copydoc CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&) - */ - virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); - private: // Implementation /**