Merge "Exporting one constructor used by csharpbinder and making an API private....

diff --combined dali-toolkit/devel-api/layouting/layout-item-impl.h
index 5f4c4a5,c44d251..8e4cdf3
--- 1/dali-toolkit/devel-api/layouting/layout-item-impl.h
--- 2/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:
    /**
@@@ -113,16 -113,6 +113,6 @@@ public
    bool IsLayoutAnimated() const;
  
    /**
-    * @brief Register child properties of layout with owner type.
-    *
-    * The Actor hierarchy uses these registered properties in the type
-    * system to ensure child custom properties are properly initialized.
-    *
-    * @param[in] containerType The type of the containing view (owner)
-    */
-   void RegisterChildProperties( const std::string& containerType );
- 
-   /**
     * @brief  This is called to find out how big a layout should be.
     *
     * The parent supplies constraint information in the width and height parameters.
@@@ -168,11 -158,6 +158,11 @@@
    static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
  
    /**
 +   * @copydoc LayoutParent::SetParent
 +   */
 +  virtual void SetParent( LayoutParent* parent ) override;
 +
 +  /**
     * @copydoc LayoutParent::GetParent
     */
    virtual LayoutParent* GetParent() override;
@@@ -445,6 -430,16 +435,16 @@@ private
     */
    void OnLayoutAnimationFinished( Animation& animation );
  
+   /**
+    * @brief Register child properties of layout with owner type.
+    *
+    * The Actor hierarchy uses these registered properties in the type
+    * system to ensure child custom properties are properly initialized.
+    *
+    * @param[in] containerType The type of the containing view (owner)
+    */
+   void RegisterChildProperties( const std::string& containerType );
+ 
  public:
    class Impl; // Class declaration is public so we can add devel API's in the future
  

diff --combined dali-toolkit/devel-api/layouting/layout-item.h
index bfe776f,6722f22..5b042c6
--- 1/dali-toolkit/devel-api/layouting/layout-item.h
--- 2/dali-toolkit/devel-api/layouting/layout-item.h
+++ b/dali-toolkit/devel-api/layouting/layout-item.h
@@@ -24,7 -24,6 +24,7 @@@
  #include <dali/public-api/object/property-index-ranges.h>
  #include <dali-toolkit/devel-api/layouting/child-layout-data.h>
  #include <dali-toolkit/devel-api/layouting/measure-spec.h>
 +#include <dali-toolkit/public-api/dali-toolkit-common.h>
  
  namespace Dali
  {
@@@ -43,7 -42,7 +43,7 @@@ using LayoutId = unsigned int
   * Base class for layouts. It is used to layout a control (or visual).
   * It can be laid out by a LayoutGroup.
   */
 -class DALI_IMPORT_API LayoutItem : public BaseHandle
 +class DALI_TOOLKIT_API LayoutItem : public BaseHandle
  {
  public:
  
@@@ -122,7 -121,7 +122,7 @@@ public
     *
     * @param[in] actor A pointer to a newly allocated Dali resource
     */
-   explicit DALI_INTERNAL LayoutItem( Internal::LayoutItem* LayoutItem );
+   explicit LayoutItem( Internal::LayoutItem* LayoutItem );
    /// @endcond
  };