projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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();
*/
void SelectNone();
- /**
- * @brief Called to get selected text.
- * @return Selected text in the TextField.
- */
- std::string SelectedText();
-
private: // From Control
/**
private: // From Control
/**
@@
-171,9
+165,9
@@
private: // From Control
virtual void OnLongPress( const LongPressGesture& gesture );
/**
virtual void OnLongPress( const LongPressGesture& gesture );
/**
- * @copydoc Control::OnS
tag
eConnection()
+ * @copydoc Control::OnS
cen
eConnection()
*/
*/
- virtual void OnS
tag
eConnection( int depth );
+ virtual void OnS
cen
eConnection( int depth );
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
/**
* @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
@@
-276,8
+270,8
@@
private: // Implementation
*/
void RenderText( Text::Controller::UpdateTextType updateTextType );
*/
void RenderText( Text::Controller::UpdateTextType updateTextType );
- // Connection needed to re-render text, when a Text Field returns to the s
tag
e.
- void OnS
tag
eConnect( Dali::Actor actor );
+ // Connection needed to re-render text, when a Text Field returns to the s
cen
e.
+ void OnS
cen
eConnect( Dali::Actor actor );
public: // For UTC only
public: // For UTC only