Merge "Add a TextEditor property to limit input to maximum characters" into devel...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-field-impl.h

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 3fd32a0..2318865 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -112,12 +112,6 @@ public:
    */
   void SelectNone();
 
-    /**
-   * @brief Called to get selected text.
-   * @return Selected text in the TextField.
-   */
-  std::string SelectedText();
-
 private: // From Control
 
   /**
@@ -171,9 +165,9 @@ private: // From Control
   virtual void OnLongPress( const LongPressGesture& gesture );
 
   /**
-   * @copydoc Control::OnStageConnection()
+   * @copydoc Control::OnSceneConnection()
    */
-  virtual void OnStageConnection( int depth );
+  virtual void OnSceneConnection( int depth );
 
   /**
    * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
@@ -276,8 +270,8 @@ private: // Implementation
    */
   void RenderText( Text::Controller::UpdateTextType updateTextType );
 
-  // Connection needed to re-render text, when a Text Field returns to the stage.
-  void OnStageConnect( Dali::Actor actor );
+  // Connection needed to re-render text, when a Text Field returns to the scene.
+  void OnSceneConnect( Dali::Actor actor );
 
 public: // For UTC only