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 "Line wrap mode property is added." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
054c1f3
..
aeee224
100644
(file)
--- 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.
*
/**
* @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.
*/
* @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.
*
/**
* @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.
*/
* @param[in] type Different placeholder-text can be shown when the control is active/inactive.
* @param[out] A string of UTF-8 characters.
*/