X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.h;h=9e193c7c09435c75584e7e987ca4d65f2d29afe9;hp=054c1f3bcea97e642b2aaf1ae26898f2da9a2522;hb=76f9ffa0234acd1b72f3d92c631052a5b4147a83;hpb=69f5648e5f2dec8fa8d09ea7887438c5ae288c63

diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
index 054c1f3..9e193c7 100644
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -480,13 +480,6 @@ public: // Update.
   /**
    * @brief Replaces any placeholder text previously set.
    *
-   * @param[in] text A string of UTF-8 characters.
-   */
-  void SetPlaceholderText( const std::string& text );
-
-  /**
-   * @brief Replaces any placeholder text previously set.
-   *
    * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
    * @param[in] text A string of UTF-8 characters.
    */
@@ -495,13 +488,6 @@ public: // Update.
   /**
    * @brief Retrieve any placeholder text previously set.
    *
-   * @param[out] A string of UTF-8 characters.
-   */
-  void GetPlaceholderText( std::string& text ) const;
-
-  /**
-   * @brief Retrieve any placeholder text previously set.
-   *
    * @param[in] type Different placeholder-text can be shown when the control is active/inactive.
    * @param[out] A string of UTF-8 characters.
    */
@@ -1013,6 +999,13 @@ public: // Default style & Input style
    */
   const std::string& GetInputOutlineProperties() const;
 
+  /**
+   * @brief Set the control's interface.
+   *
+   * @param[in] controlInterface The control's interface.
+   */
+  void SetControlInterface( ControlInterface* controlInterface );
+
 public: // Queries & retrieves.
 
   /**
@@ -1187,6 +1180,13 @@ public: // Text-input Event Queuing.
    */
   void PasteClipboardItemEvent();
 
+  /**
+   * @brief Return true when text control should clear key input focus when escape key is pressed.
+   *
+   * @return Whether text control should clear key input focus or not when escape key is pressed.
+   */
+  bool ShouldClearFocusOnEscape() const;
+
 protected: // Inherit from Text::Decorator::ControllerInterface.
 
   /**