X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.cpp;h=a4685ff5b21613561b9ae17430bc0f6f0141a3eb;hp=b5c65e15c7a86ccd59a7301bb05ad77053fd2720;hb=1498b458e65cce375898c232cfa87c831b1f1c6b;hpb=16634ab902b66b0ba2f3f39af8ff6ed25b5f7115

diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index b5c65e1..a4685ff 100755
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -110,30 +110,37 @@ void SetInputMethodContext( Internal::Control& control, InputMethodContext& inpu
   Internal::Control::Impl::Get( control ).SetInputMethodContext( inputMethodContext );
 }
 
-Toolkit::LayoutBase GetLayout( Control control )
+Toolkit::LayoutItem GetLayout( Control control )
 {
   const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( control );
   const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl );
-  return Toolkit::LayoutBase( controlDataImpl.GetLayout().Get() );
+  return Toolkit::LayoutItem( controlDataImpl.GetLayout().Get() );
 }
 
-Toolkit::LayoutBase GetLayout( Internal::Control& control )
+Toolkit::LayoutItem GetLayout( Internal::Control& control )
 {
   Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control );
-  return Toolkit::LayoutBase( controlDataImpl.GetLayout().Get() );
+  return Toolkit::LayoutItem( controlDataImpl.GetLayout().Get() );
 }
 
-void SetLayout( Internal::Control& control, Toolkit::LayoutBase layout )
+void SetLayout( Internal::Control& control, Toolkit::LayoutItem layout )
 {
   Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control );
   controlDataImpl.SetLayout( GetImplementation( layout ) );
 }
 
-void SetLayout( Control control, Toolkit::LayoutBase layout )
+void SetLayout( Control control, Toolkit::LayoutItem layout )
 {
   Internal::Control& internalControl = Toolkit::Internal::GetImplementation( control );
   Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl );
-  controlDataImpl.SetLayout( GetImplementation( layout ) );
+  if( layout )
+  {
+    controlDataImpl.SetLayout( GetImplementation( layout ) );
+  }
+  else
+  {
+    controlDataImpl.RemoveLayout();
+  }
 }
 
 } // namespace DevelControl