Merge "DALi Version 1.3.29" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / layouting / layout-controller.h

diff --git a/dali-toolkit/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h
index 96d44f0..fe955a4 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-controller.h
+++ b/dali-toolkit/devel-api/layouting/layout-controller.h
@@ -19,7 +19,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/devel-api/layouting/layout-base.h>
+#include <dali-toolkit/devel-api/layouting/layout-item.h>
 #include <dali-toolkit/devel-api/layouting/layout-group.h>
 
 namespace Dali
@@ -36,7 +36,7 @@ class LayoutController;
  * @brief Controls the process of layouting the control tree. It provides methods to enable
  * controls to re-layout and internal systems to separately measure and layout controls.
  */
-class DALI_IMPORT_API LayoutController : public BaseHandle
+class DALI_TOOLKIT_API LayoutController : public BaseHandle
 {
 public:
   /**
@@ -65,7 +65,7 @@ public:
    * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out.
    * @param[in] layout The layout to measure & relayout.
    */
-  void RequestLayout( LayoutBase layout );
+  void RequestLayout( LayoutItem layout );
 
 public:
   /// @cond internal