X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.cpp;h=46509da57017325f04db7c1c4ca16b0a4012224e;hb=aa05fcf7ac4aef5d56a2a581c9103a160c4f052c;hp=a3e4d009ee3ae2b7e5c87d84c4632a588ae62160;hpb=bfdf7a73a4d50dfb60d0f7fa5b214f61c920bf9c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp index a3e4d00..46509da 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include // INTERNAL INCLUDES #include @@ -315,8 +315,10 @@ void ToolBar::OnInitialize() mLayout.SetRelativeWidth( 1, mRightRelativeSpace ); } -void ToolBar::OnControlChildAdd(Actor& child) +void ToolBar::OnChildAdd(Actor& child) { + Control::OnChildAdd( child ); + if( !mInitializing ) { // An actor is being added through the Actor's API. @@ -330,7 +332,7 @@ void ToolBar::OnControlChildAdd(Actor& child) AddControl( child, DEFAULT_RELATIVE_SIZE, DEFAULT_ALIGNMENT, Toolkit::ToolBar::DEFAULT_PADDING ); } - // No OnControlChildRemove method required because Actors are added to the mLayout table view, so if an + // No OnChildRemove method required because Actors are added to the mLayout table view, so if an // actor is removed using the Actor::RemoveChild method it will not remove anything because the // actor is in mLayout not in Self(). }