X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=193dd9de0e6dd76209dc94a5c2e81528d8baa9cb;hb=d6c840efea857e4e14115940a6f14821a23c81fd;hp=0cae2a368a2bbc1f6157cfb8ade20b53934e6973;hpb=26efc210fc636e51a4d3df9ae7fbcc1d2a8bac40;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 0cae2a3..193dd9d 100755
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -31,7 +31,6 @@
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
 #include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
@@ -109,8 +108,6 @@ public:
    */
   void SelectWholeText();
 
-  Text::ControllerPtr getController();
-
 private: // From Control
 
   /**
@@ -183,21 +180,6 @@ private: // From Control
 // From EditableControlInterface
 
   /**
-   * @copydoc Text::ControlInterface::TextInserted()
-   */
-  virtual void TextInserted( unsigned int position, unsigned int length, const std::string &content );
-
-  /**
-   * @copydoc Text::ControlInterface::TextDeleted()
-   */
-  virtual void TextDeleted( unsigned int position, unsigned int length, const std::string &content );
-
-  /**
-   * @copydoc Text::ControlInterface::CaretMoved()
-   */
-  virtual void CaretMoved( unsigned int position );
-
-  /**
    * @copydoc Text::ControlInterface::TextChanged()
    */
   virtual void TextChanged();
@@ -287,6 +269,10 @@ private: // Implementation
   // Connection needed to re-render text, when a Text Field returns to the stage.
   void OnStageConnect( Dali::Actor actor );
 
+public: // For UTC only
+
+  Text::ControllerPtr GetTextController() { return mController; }
+
 private: // Data
 
   // Signals
@@ -305,36 +291,13 @@ private: // Data
 
   Actor mRenderableActor;
   Actor mActiveLayer;
+  Actor mBackgroundActor;
   CallbackBase* mIdleCallback;
 
   float mAlignmentOffset;
   int mRenderingBackend;
   int mExceedPolicy;
   bool mHasBeenStaged:1;
-
-protected:
-  struct AccessibleImpl : public Control::Impl::AccessibleImpl,
-                          public virtual Dali::Accessibility::Text,
-                          public virtual Dali::Accessibility::EditableText
-  {
-    using Control::Impl::AccessibleImpl::AccessibleImpl;
-
-    std::string GetName() override;
-    std::string GetText( size_t startOffset, size_t endOffset ) override;
-    size_t GetCharacterCount() override;
-    size_t GetCaretOffset() override;
-    bool SetCaretOffset(size_t offset) override;
-    Dali::Accessibility::Range
-    GetTextAtOffset( size_t offset,
-                     Dali::Accessibility::TextBoundary boundary ) override;
-    Dali::Accessibility::Range GetSelection( size_t selectionNum ) override;
-    bool RemoveSelection( size_t selectionNum ) override;
-    bool SetSelection( size_t selectionNum, size_t startOffset,
-                       size_t endOffset ) override;
-    bool CopyText( size_t startPosition, size_t endPosition ) override;
-    bool CutText( size_t startPosition, size_t endPosition ) override;
-    Dali::Accessibility::States CalculateStates() override;
-  };
 };
 
 } // namespace Internal