X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.cpp;h=a0ca86ef6004ef257a3c74927488fe3f2f35a6c2;hb=refs%2Fchanges%2F28%2F38928%2F2;hp=7ba35c5948468daea14668b1bef1ba14f7810aa6;hpb=70ee2ab38bb1aa71222e65863ebb98d395c449a2;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 7ba35c5..a0ca86e 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -19,7 +19,7 @@ #include "tool-bar-impl.h" // EXTERNAL INCLUDES -#include +#include #include #include #include @@ -57,7 +57,7 @@ Toolkit::ToolBar ToolBar::New() // Create the implementation, temporarily owned on stack IntrusivePtr< ToolBar > internalToolBar = new ToolBar(); - // Pass ownership to Toolkit::View + // Pass ownership to Toolkit::Toolbar Toolkit::ToolBar toolBar( *internalToolBar ); // Second-phase init of the implementation @@ -76,7 +76,7 @@ void ToolBar::SetBackground( Actor background ) background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER ); background.SetSize( Vector2( mToolBarSize.width, mToolBarSize.height ) ); - RenderableActor renderableActor = RenderableActor::DownCast( background ); + ImageActor renderableActor = ImageActor::DownCast( background ); if ( renderableActor ) { renderableActor.SetSortModifier( 1.f );