mBackgroundImage.SetVisible( !( mButtons.empty() && mPopupLayout.GetChildCount() == 0 ) );
// Relayout All buttons
- if ( !mButtons.empty() )
+ if( !mButtons.empty() )
{
// All buttons should be the same size and fill the button area. The button spacing needs to be accounted for as well.
Vector2 buttonSize( ( ( size.width - mPopupStyle->buttonSpacing * ( mButtons.size() + 1 ) ) / mButtons.size() ),
Vector3 buttonPosition( mPopupStyle->buttonSpacing, 0.0f, 0.0f );
- for ( ActorIter iter = mButtons.begin(), endIter = mButtons.end();
+ for( std::vector< Actor >::iterator iter = mButtons.begin(), endIter = mButtons.end();
iter != endIter;
++iter, buttonPosition.x += mPopupStyle->buttonSpacing + buttonSize.width )
{
else
{
// Rebuild the focus chain because button or content can be added or removed dynamically
- ActorContainer focusableActors;
+ std::vector< Actor > focusableActors;
if( mContent && mContent.IsKeyboardFocusable() )
{
focusableActors.push_back(mContent);
}
}
- for ( ActorContainer::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter )
+ for( std::vector< Actor >::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter )
{
if ( currentFocusedActor == *iter )
{