X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Flayout-group.h;h=315f3d4febe66f75d711f8650fa43fa868d4e838;hb=20125e47f9f183b0d39972ada01280da8984d942;hp=afcf2a952578fdfda1c266bc09e4dd206421c7dd;hpb=dc0a5effb8813332a66025da6d3112c28c3fecba;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h
old mode 100644
new mode 100755
index afcf2a9..315f3d4
--- a/dali-toolkit/devel-api/layouting/layout-group.h
+++ b/dali-toolkit/devel-api/layouting/layout-group.h
@@ -17,9 +17,10 @@
  */
 
 #include <memory>
-#include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/actors/actor-enumerations.h>
-#include <dali-toolkit/devel-api/layouting/layout-base.h>
+#include <dali-toolkit/devel-api/toolkit-property-index-ranges.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali-toolkit/devel-api/layouting/layout-item.h>
 #include <dali-toolkit/devel-api/layouting/measure-spec.h>
 
 namespace Dali
@@ -34,7 +35,7 @@ class LayoutGroup;
 
 
 /**
- * A layout that has layout children. Implements LayoutBase.
+ * A layout that has layout children. Implements LayoutItem.
  * It can both layout it's children, and be laid out by a parent container.
  *
  * A layout group automatically handles adding a Control container's children to itself,
@@ -48,23 +49,16 @@ class LayoutGroup;
  * To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body.
  *
  */
-class DALI_IMPORT_API LayoutGroup : public LayoutBase
+class DALI_TOOLKIT_API LayoutGroup : public LayoutItem
 {
 public:
   using LayoutId = unsigned int;
   static const unsigned int UNKNOWN_ID = 0;
 
-  enum PropertyRange
-  {
-    CHILD_PROPERTY_START_INDEX = CHILD_PROPERTY_REGISTRATION_START_INDEX+100,
-    CHILD_PROPERTY_END_INDEX   = CHILD_PROPERTY_START_INDEX+1000
-  };
-
   struct ChildProperty
   {
     enum
     {
-      MARGIN_SPECIFICATION = CHILD_PROPERTY_START_INDEX,
     };
   };
 
@@ -112,7 +106,7 @@ public:
    * @param[in] childLayout The layout to add.
    * @return an Id of the child.
    */
-  LayoutId Add( LayoutBase& childLayout );
+  LayoutId Add( LayoutItem& childLayout );
 
   /**
    * @brief Add a child layout to the layout group
@@ -126,14 +120,14 @@ public:
    *
    * @param[in] childLayout The layout to remove.
    */
-  void Remove( LayoutBase& childLayout );
+  void Remove( LayoutItem& childLayout );
 
   /**
    * @brief Get the child at the given index.
    *
    * @param[in] index The index of the child.
    */
-  LayoutBase GetChildAt( unsigned int index ) const;
+  LayoutItem GetChildAt( unsigned int index ) const;
 
   /**
    * @brief Get the count of the children of the layout
@@ -148,13 +142,13 @@ public:
    * @param[in] childId The id of the child to get
    * @return A handle to the child layout, or empty if not found
    */
-  LayoutBase GetChild( LayoutId childId ) const ;
+  LayoutItem GetChild( LayoutId childId ) const ;
 
   /**
    * Delete template method to remove implicit casting to integer types.
    */
   template <typename T>
-    LayoutBase GetChild( T childId ) = delete;
+    LayoutItem GetChild( T childId ) = delete;
 
 public:
   /// @cond internal