Merge "Bug fix when creating background of control using ImageActor" into devel/master

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 2c32e3d,ed2fc4b..b1150ff
--- 1/dali-toolkit/internal/controls/text-controls/text-field-impl.h
--- 2/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@@ -140,14 -140,9 +140,14 @@@ private: // From Contro
    virtual void OnPan( const PanGesture& gesture );
  
    /**
 +   * @copydoc Control::OnLongPress()
 +   */
 +  virtual void OnLongPress( const LongPressGesture& gesture );
 +
 +  /**
     * @copydoc Control::OnStageConnection()
     */
-   virtual void OnStageConnection( unsigned int depth );
+   virtual void OnStageConnection( int depth );
  
    /**
     * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)