Changes required after some Actor Devel APIs made public

Change-Id: Ia6c2e7069b23e9e16199a6962e6fd3a33bd1bb3c

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index c7dd2e4..cde648a 100644 (file)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -593,7 +593,7 @@ void Popup::SetPopupBackgroundImage( Actor image )
   const bool prevAlter = mAlterAddedChild;
   mAlterAddedChild = false;
   mPopupContainer.Add( mPopupBackgroundImage );
-  DevelActor::LowerToBottom(mPopupBackgroundImage);
+  mPopupBackgroundImage.LowerToBottom();
   mAlterAddedChild = prevAlter;
 
   if( mTailImage )

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 77005c0..63f0707 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1375,13 +1375,13 @@ void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType )
     // Make sure the actors are parented correctly with/without clipping
     Actor self = mStencil ? mStencil : Self();
 
-    for( std::vector<Actor>::const_iterator it = mClippingDecorationActors.begin(),
+    for( std::vector<Actor>::iterator it = mClippingDecorationActors.begin(),
            endIt = mClippingDecorationActors.end();
          it != endIt;
          ++it )
     {
       self.Add( *it );
-      DevelActor::LowerToBottom( *it );
+      it->LowerToBottom();
     }
     mClippingDecorationActors.clear();
 

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 25273f1..d035c5e 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1445,13 +1445,13 @@ void TextField::RenderText( Text::Controller::UpdateTextType updateTextType )
     // Make sure the actors are parented correctly with/without clipping
     Actor self = mStencil ? mStencil : Self();
 
-    for( std::vector<Actor>::const_iterator it = mClippingDecorationActors.begin(),
+    for( std::vector<Actor>::iterator it = mClippingDecorationActors.begin(),
            endIt = mClippingDecorationActors.end();
          it != endIt;
          ++it )
     {
       self.Add( *it );
-      DevelActor::LowerToBottom(*it);
+      it->LowerToBottom();
     }
     mClippingDecorationActors.clear();