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 branch 'tizen' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-input
/
text-input-impl.h
diff --git
a/dali-toolkit/internal/controls/text-input/text-input-impl.h
b/dali-toolkit/internal/controls/text-input/text-input-impl.h
index
19d40b9
..
6dfe840
100644
(file)
--- a/
dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/
dali-toolkit/internal/controls/text-input/text-input-impl.h
@@
-50,13
+50,6
@@
class TextInput : public Control
{
public:
{
public:
- // Properties
- enum
- {
- TEXTINPUT_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- TEXTINPUT_PROPERTY_END_INDEX = TEXTINPUT_PROPERTY_START_INDEX + 512 ///< Reserving property indices
- };
-
/**
* Create a new TextInput
* @return instrusive ptr to a TextInput
/**
* Create a new TextInput
* @return instrusive ptr to a TextInput
@@
-576,7
+569,7
@@
private: // From Control
/**
* @copydoc Control::OnRelayout()
*/
/**
* @copydoc Control::OnRelayout()
*/
- virtual void OnRelayout( const Vector2& size,
ActorSize
Container& container );
+ virtual void OnRelayout( const Vector2& size,
Relayout
Container& container );
/**
* Retrieves the text-input's natural size by calling TextView::GetNaturalSize().
/**
* Retrieves the text-input's natural size by calling TextView::GetNaturalSize().