[dali_1.0.46] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor.cpp

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 50632e8..1f413fb 100644 (file)
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -479,11 +479,6 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const
   return GetImplementation(*this).GetRelayoutSize( dimension );
 }
 
-void Actor::PropagateRelayoutFlags()
-{
-  GetImplementation(*this).PropagateRelayoutFlags();
-}
-
 void Actor::SetPadding( const Padding& padding )
 {
   Internal::Actor& impl = GetImplementation(*this);
@@ -548,9 +543,9 @@ Actor::HoverSignalType& Actor::HoveredSignal()
   return GetImplementation(*this).HoveredSignal();
 }
 
-Actor::MouseWheelEventSignalType& Actor::MouseWheelEventSignal()
+Actor::WheelEventSignalType& Actor::WheelEventSignal()
 {
-  return GetImplementation(*this).MouseWheelEventSignal();
+  return GetImplementation(*this).WheelEventSignal();
 }
 
 Actor::OnStageSignalType& Actor::OnStageSignal()
@@ -573,13 +568,4 @@ Actor::Actor(Internal::Actor* internal)
 {
 }
 
-void UnparentAndReset( Actor& actor )
-{
-  if( actor )
-  {
-    actor.Unparent();
-    actor.Reset();
-  }
-}
-
 } // namespace Dali