From: David Steele <david.steele@samsung.com>
Date: Wed, 20 Jun 2018 11:09:47 +0000 (+0000)
Subject: Merge "Fix nested layout issue" into devel/master
X-Git-Tag: dali_1.3.29~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e4235b523a775fbbee334dea6cd929a6f3ccbc80;hp=-c

Merge "Fix nested layout issue" into devel/master
---

e4235b523a775fbbee334dea6cd929a6f3ccbc80
diff --combined dali-toolkit/devel-api/layouting/layout-item-impl.h
index 40a7ec0,fe43f07..5f4c4a5
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h
@@@ -44,8 -44,8 +44,8 @@@ using LayoutItemPtr = IntrusivePtr<Layo
  /**
   * Base class for layouts.
   */
 -class DALI_IMPORT_API LayoutItem : public BaseObject,
 -                                   public LayoutParent
 +class DALI_TOOLKIT_API LayoutItem : public BaseObject,
 +                                    public LayoutParent
  {
  public:
    /**
@@@ -168,6 -168,11 +168,11 @@@ public
    static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
  
    /**
+    * @copydoc LayoutParent::SetParent
+    */
+   virtual void SetParent( LayoutParent* parent ) override;
+ 
+   /**
     * @copydoc LayoutParent::GetParent
     */
    virtual LayoutParent* GetParent() override;
diff --combined dali-toolkit/devel-api/layouting/layout-parent-impl.h
index a6d76c3,4ce1ab0..d55fb42
--- a/dali-toolkit/devel-api/layouting/layout-parent-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
@@@ -17,8 -17,6 +17,8 @@@
   * limitations under the License.
   */
  
 +#include <dali-toolkit/public-api/dali-toolkit-common.h>
 +
  namespace Dali
  {
  namespace Toolkit
@@@ -32,10 -30,15 +32,15 @@@ namespace Interna
   * 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:
    /**
+    * Set the parent of this layout.
+    */
+   virtual void SetParent( LayoutParent* parent ) = 0;
+ 
+   /**
     * Get the parent of this layout.
     */
    virtual LayoutParent* GetParent() = 0;