Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / alignment / alignment-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index ba6aced..a02ef71 100644 (file)
--- a/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/base/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@ -561,7 +561,7 @@ void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
     }
 
     Vector3 actorSize ( actor.GetCurrentSize() );
-    Control control( Control::DownCast( actor ) );
+    Toolkit::Control control( Toolkit::Control::DownCast( actor ) );
     if ( actorSize == Vector3::ZERO && control )
     {
       actorSize = control.GetNaturalSize();
@@ -624,7 +624,7 @@ void Alignment::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
 }
 
 Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )
-: ControlImpl( false ),  // doesn't require touch events
+: Control( CONTROL_BEHAVIOUR_NONE ),
   mHorizontal( horizontal ),
   mVertical( vertical ),
   mScaling( Toolkit::Alignment::ScaleNone ),