Merge "Fix nested layout issue" into devel/master

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

diff --git a/dali-toolkit/devel-api/layouting/layout-parent-impl.h b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
index 4ce1ab0..d55fb42 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-parent-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 
  * limitations under the License.
  */
 

+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+

 namespace Dali
 {
 namespace Toolkit
 namespace Dali
 {
 namespace Toolkit


@@ -30,7 +32,7 @@ namespace Internal
  * Needed to prevent circular inheritance - most LayoutBases have a parent,
  * but parenting is provided by LayoutGroup, which is a sub-class of LayoutBase.
  */
  * Needed to prevent circular inheritance - most LayoutBases have a parent,
  * but parenting is provided by LayoutGroup, which is a sub-class of LayoutBase.
  */

-class DALI_IMPORT_API LayoutParent
+class DALI_TOOLKIT_API LayoutParent

 {
 public:
   /**
 {
 public:
   /**