X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.h;h=13e68bcb3d9e74ec99d62fb856b5507dc91608a1;hb=24ea337df1049251ab2e47c556edc6e8458f9c93;hp=b2b3bd91829abba30182c4c495cf8aae7924852a;hpb=a78bb823aebc305823855ac35b3413aaff7bc684;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
old mode 100644
new mode 100755
index b2b3bd9..13e68bc
--- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
@@ -22,6 +22,9 @@
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
+#include <dali/public-api/common/dali-common.h>
+
+
 namespace Dali
 {
 
@@ -53,6 +56,12 @@ public:
   virtual ~GridLayout();
 
   /**
+   * Apply grid layout Properties.
+   * @param[in] properties The properties of the layout.
+   */
+  void SetGridLayoutProperties(const Property::Map& properties);
+
+  /**
    * @brief Set the number of columns in the layout.
    *
    * @param[in] columns The number of columns.
@@ -234,11 +243,6 @@ private:
   virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
 
   /**
-   * @copydoc ItemLayout::GetResizeAnimation()
-   */
-  virtual void GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const;
-
-  /**
    * @copydoc ItemLayout::GetScrollDirection()
    */
   virtual Degree GetScrollDirection() const;
@@ -262,6 +266,14 @@ protected:
 
 private:
 
+  // Undefined
+  GridLayout( const GridLayout& itemLayout );
+
+  // Undefined
+  GridLayout& operator=( const GridLayout& rhs );
+
+private:
+
   struct Impl;
   Impl* mImpl;
 };