Merge "Fix documentation for Text::EditableControlInterface interface override functi...

diff --cc dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index a149a79,2387d0a..f89520e
--- 1/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
--- 2/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@@ -184,46 -177,24 +184,46 @@@ private: // From Contro
  // From EditableControlInterface
  
    /**
-    * @copydoc Text::ControlInterface::TextChanged()
+    * @copydoc Text::EditableControlInterface::TextChanged()
     */
 -  virtual void TextChanged();
 +  void TextChanged() override;
  
    /**
-    * @copydoc Text::ControlInterface::MaxLengthReached()
+    * @copydoc Text::EditableControlInterface::MaxLengthReached()
     */
 -  virtual void MaxLengthReached();
 +  void MaxLengthReached() override;
  
    /**
-    * @copydoc Text::ControlInterface::InputStyleChanged()
+    * @copydoc Text::EditableControlInterface::InputStyleChanged()
     */
 -  virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
 +  void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override;
  
    /**
-    * @copydoc Text::ControlInterface::AddDecoration()
+    * @copydoc Text::EditableControlInterface::AddDecoration()
     */
 -  virtual void AddDecoration( Actor& actor, bool needsClipping );
 +  void AddDecoration( Actor& actor, bool needsClipping ) override;
 +
 +// From SelectableControlInterface
 +public:
 +  /**
 +   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
 +   */
 +  void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override;
 +
 +  /**
 +   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
 +   */
 +  Uint32Pair GetTextSelectionRange() const override;
 +
 +  /**
 +   * @copydoc Text::EditableControlInterface::IsEditable()
 +   */
 +  bool IsEditable() const override;
 +
 +  /**
 +   * @copydoc Text::EditableControlInterface::SetEditable()
 +   */
 +  void SetEditable( bool editable ) override;
  
  private: // Implementation
  

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.h
index aa5350d,201d5d1..165234b
--- 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
@@@ -185,46 -184,24 +185,46 @@@ private: // From Contro
  // From EditableControlInterface
  
    /**
-    * @copydoc Text::ControlInterface::TextChanged()
+    * @copydoc Text::EditableControlInterface::TextChanged()
     */
 -  virtual void TextChanged();
 +  void TextChanged() override;
  
    /**
-    * @copydoc Text::ControlInterface::MaxLengthReached()
+    * @copydoc Text::EditableControlInterface::MaxLengthReached()
     */
 -  virtual void MaxLengthReached();
 +  void MaxLengthReached() override;
  
    /**
-    * @copydoc Text::ControlInterface::InputStyleChanged()
+    * @copydoc Text::EditableControlInterface::InputStyleChanged()
     */
 -  virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
 +  void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override;
  
    /**
-    * @copydoc Text::ControlInterface::AddDecoration()
+    * @copydoc Text::EditableControlInterface::AddDecoration()
     */
 -  virtual void AddDecoration( Actor& actor, bool needsClipping );
 +  void AddDecoration( Actor& actor, bool needsClipping ) override;
 +
 +// From SelectableControlInterface
 +public:
 +  /**
 +   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
 +   */
 +  void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override;
 +
 +  /**
 +   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
 +   */
 +  Uint32Pair GetTextSelectionRange() const override;
 +
 +  /**
 +   * @copydoc Text::EditableControlInterface::IsEditable()
 +   */
 +  bool IsEditable() const override;
 +
 +  /**
 +   * @copydoc Text::EditableControlInterface::SetEditable()
 +   */
 +  void SetEditable( bool editable ) override;
  
  private: // Implementation