Merge "Added Control::SetSubState handling" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / item-view / grid-layout.h

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 (file)
new mode 100755 (executable)
index 8cbdd33..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.
@@ -257,6 +266,14 @@ protected:
 
 private:
 
+  // Undefined
+  GridLayout( const GridLayout& itemLayout );
+
+  // Undefined
+  GridLayout& operator=( const GridLayout& rhs );
+
+private:
+
   struct Impl;
   Impl* mImpl;
 };