Merge "(ItemFactory) Add GetExtension" into tizen

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
index 9efd53f..3dcc6e8 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
@@ -763,3 +763,11 @@ int UtcDaliItemViewSetItemsParentOriginP(void)
   DALI_TEST_CHECK(view.GetItem(0).GetCurrentParentOrigin() == parentOrigin);
   END_TEST;
 }
+
+int UtcDaliItemFactoryGetExtention(void)
+{
+  ToolkitTestApplication application;
+  TestItemFactory factory;
+  DALI_TEST_CHECK( factory.GetExtension() == NULL );
+  END_TEST;
+}

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
index e02c62b..97d12f6 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
@@ -35,6 +35,8 @@ class ItemFactory
 {
 public:
 
+  class Extension; ///< Forward declare future extension interface
+
   /**
    * @brief Virtual destructor.
    */
@@ -63,6 +65,16 @@ public:
    * @param[in] actor The actor that represents the released item.
    */
   virtual void ItemReleased(unsigned int itemId, Actor actor) {};
+
+  /**
+   * Retrieve the extension for this control
+   *
+   * @return The extension if available, NULL otherwise
+   */
+  virtual Extension* GetExtension()
+  {
+    return NULL;
+  }
 };
 
 } // namespace Toolkit