From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 2 Jul 2015 13:55:10 +0000 (-0700)
Subject: Merge "Bug fix when creating background of control using ImageActor" into devel/master
X-Git-Tag: dali_1.0.48~19
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=610da2945e1b56e09b12466b1c23b90aa348abdd

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

610da2945e1b56e09b12466b1c23b90aa348abdd
diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 2c32e3d,ed2fc4b..b1150ff
--- a/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&)