[dali_1.2.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / flex-container / flex-container.h

diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h
index 856c83a..ef86a70 100644 (file)
--- a/dali-toolkit/public-api/controls/flex-container/flex-container.h
+++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h
@@ -190,6 +190,10 @@ public:
    */
   struct Property
   {
+    /**
+     * @brief An enumeration of properties belonging to the FlexContainer class.
+     * @SINCE_1_1.35
+     */
     enum
     {
       // Event side properties
@@ -208,6 +212,10 @@ public:
    */
   struct ChildProperty
   {
+    /**
+     * @brief An enumeration of child properties belonging to the FlexContainer class.
+     * @SINCE_1_1.35
+     */
     enum
     {
       // Event side child properties
@@ -235,6 +243,8 @@ public:
   /**
    * @brief Assignment operator. Changes this handle to point to another real object
    * @SINCE_1_1.35
+   * @param[in] handle Handle to an object
+   * @return A reference to this
    */
   FlexContainer& operator=( const FlexContainer& handle );
 
@@ -271,6 +281,7 @@ public:
 
 public: // Not intended for application developers
 
+  /// @cond internal
   /**
    * @brief Creates a handle using the Toolkit::Internal implementation.
    * @SINCE_1_1.35
@@ -286,6 +297,7 @@ public: // Not intended for application developers
    * @param[in] internal A pointer to the internal CustomActor.
    */
   explicit DALI_INTERNAL FlexContainer( Dali::Internal::CustomActor* internal );
+  /// @endcond
 };
 
 /**