Change-Id: If1c878669227cf0913e7ad6117610dbc4d5f7c3f
-void Actor::ConnectToStage( Stage& stage, int index )
+void Actor::ConnectToStage( int index )
{
// This container is used instead of walking the Actor hierachy.
// It protects us when the Actor hierachy is modified during OnStageConnectionExternal callbacks.
ActorContainer connectionList;
// This stage is atomic i.e. not interrupted by user callbacks
{
// This container is used instead of walking the Actor hierachy.
// It protects us when the Actor hierachy is modified during OnStageConnectionExternal callbacks.
ActorContainer connectionList;
// This stage is atomic i.e. not interrupted by user callbacks
- RecursiveConnectToStage( stage, connectionList, index );
+ RecursiveConnectToStage( connectionList, index );
// Notify applications about the newly connected actors.
const ActorIter endIter = connectionList.end();
// Notify applications about the newly connected actors.
const ActorIter endIter = connectionList.end();
-void Actor::RecursiveConnectToStage( Stage& stage, ActorContainer& connectionList, int index )
+void Actor::RecursiveConnectToStage( ActorContainer& connectionList, int index )
{
DALI_ASSERT_ALWAYS( !OnStage() );
{
DALI_ASSERT_ALWAYS( !OnStage() );
for( ActorIter iter = mChildren->begin(); iter != endIter; ++iter )
{
Actor& actor = GetImplementation( *iter );
for( ActorIter iter = mChildren->begin(); iter != endIter; ++iter )
{
Actor& actor = GetImplementation( *iter );
- actor.RecursiveConnectToStage( stage, connectionList );
+ actor.RecursiveConnectToStage( connectionList );
if ( Stage::IsInstalled() && // Don't emit signals or send messages during Core destruction
parent->OnStage() )
{
if ( Stage::IsInstalled() && // Don't emit signals or send messages during Core destruction
parent->OnStage() )
{
- StagePtr stage = parent->mStage;
-
// Instruct each actor to create a corresponding node in the scene graph
// Instruct each actor to create a corresponding node in the scene graph
- ConnectToStage(*stage, index);
+ ConnectToStage( index );
}
}
else // parent being set to NULL
}
}
else // parent being set to NULL
* @param[in] stage The stage.
* @param[in] index If set, it is only used for positioning the actor within the parent's child list.
*/
* @param[in] stage The stage.
* @param[in] index If set, it is only used for positioning the actor within the parent's child list.
*/
- void ConnectToStage(Stage& stage, int index = -1);
+ void ConnectToStage( int index = -1 );
/**
* Helper for ConnectToStage, to recursively connect a tree of actors.
* This is atomic i.e. not interrupted by user callbacks.
/**
* Helper for ConnectToStage, to recursively connect a tree of actors.
* This is atomic i.e. not interrupted by user callbacks.
- * @param[in] stage The stage.
* @param[in] index If set, it is only used for positioning the actor within the parent's child list.
* @param[out] connectionList On return, the list of connected actors which require notification.
*/
* @param[in] index If set, it is only used for positioning the actor within the parent's child list.
* @param[out] connectionList On return, the list of connected actors which require notification.
*/
- void RecursiveConnectToStage( Stage& stage, ActorContainer& connectionList, int index = -1 );
+ void RecursiveConnectToStage( ActorContainer& connectionList, int index = -1 );
/**
* Connect the Node associated with this Actor to the scene-graph.
/**
* Connect the Node associated with this Actor to the scene-graph.