From: David Steele Date: Wed, 20 Jun 2018 13:22:38 +0000 (+0000) Subject: Merge "Exporting one constructor used by csharpbinder and making an API private.... X-Git-Tag: dali_1.3.29~4 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6c66c6ac8f3ba5f396cfa617d5a6310df53a4f4d;hp=6034549c1b9a7d8f82a1ce7f826dd1fd495c7dbe Merge "Exporting one constructor used by csharpbinder and making an API private." into devel/master --- diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h index 5f4c4a5..8e4cdf3 100644 --- a/dali-toolkit/devel-api/layouting/layout-item-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h @@ -113,16 +113,6 @@ public: bool IsLayoutAnimated() const; /** - * @brief Register child properties of layout with owner type. - * - * The Actor hierarchy uses these registered properties in the type - * system to ensure child custom properties are properly initialized. - * - * @param[in] containerType The type of the containing view (owner) - */ - void RegisterChildProperties( const std::string& containerType ); - - /** * @brief This is called to find out how big a layout should be. * * The parent supplies constraint information in the width and height parameters. @@ -445,6 +435,16 @@ private: */ void OnLayoutAnimationFinished( Animation& animation ); + /** + * @brief Register child properties of layout with owner type. + * + * The Actor hierarchy uses these registered properties in the type + * system to ensure child custom properties are properly initialized. + * + * @param[in] containerType The type of the containing view (owner) + */ + void RegisterChildProperties( const std::string& containerType ); + public: class Impl; // Class declaration is public so we can add devel API's in the future diff --git a/dali-toolkit/devel-api/layouting/layout-item.h b/dali-toolkit/devel-api/layouting/layout-item.h index bfe776f..5b042c6 100644 --- a/dali-toolkit/devel-api/layouting/layout-item.h +++ b/dali-toolkit/devel-api/layouting/layout-item.h @@ -122,7 +122,7 @@ public: * * @param[in] actor A pointer to a newly allocated Dali resource */ - explicit DALI_INTERNAL LayoutItem( Internal::LayoutItem* LayoutItem ); + explicit LayoutItem( Internal::LayoutItem* LayoutItem ); /// @endcond };