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
Purge underscored header file barriers
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
text-controls
/
text-label.h
diff --git
a/dali-toolkit/public-api/controls/text-controls/text-label.h
b/dali-toolkit/public-api/controls/text-controls/text-label.h
index
106f234
..
a3a0c3d
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/
dali-toolkit/public-api/controls/text-controls/text-label.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_LABEL_H__
-#define
__DALI_TOOLKIT_TEXT_LABEL_H__
+#ifndef
DALI_TOOLKIT_TEXT_LABEL_H
+#define
DALI_TOOLKIT_TEXT_LABEL_H
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-63,7
+63,7
@@
class TextLabel;
*
* @SINCE_1_0.0
*/
*
* @SINCE_1_0.0
*/
-class DALI_
IMPOR
T_API TextLabel : public Control
+class DALI_
TOOLKI
T_API TextLabel : public Control
{
public:
{
public:
@@
-169,39
+169,29
@@
public:
UNUSED_PROPERTY_TEXT_COLOR,
/**
UNUSED_PROPERTY_TEXT_COLOR,
/**
- * @DEPRECATED_1_1.37 Use SHADOW instead
- * @brief The drop shadow offset 0 indicates no shadow.
- * @details Name "shadowOffset", type Property::VECTOR2.
+ * @brief This property is removed because it's deprecated.
*/
*/
-
SHADOW_OFFSET
,
+
RESERVED_PROPERTY_01
,
/**
/**
- * @DEPRECATED_1_1.37 Use SHADOW instead
- * @brief The color of a drop shadow.
- * @details Name "shadowColor", type Property::VECTOR4
+ * @brief This property is removed because it's deprecated.
*/
*/
-
SHADOW_COLOR
,
+
RESERVED_PROPERTY_02
,
/**
/**
- * @DEPRECATED_1_1.37 Use UNDERLINE instead
- * @brief The underline enabled flag.
- * @details Name "underlineEnabled", type Property::BOOLEAN.
+ * @brief This property is removed because it's deprecated.
*/
*/
-
UNDERLINE_ENABLED
,
+
RESERVED_PROPERTY_03
,
/**
/**
- * @DEPRECATED_1_1.37 Use UNDERLINE instead
- * @brief The color of the underline.
- * @details Name "underlineColor", type Property::VECTOR4.
+ * @brief This property is removed because it's deprecated.
*/
*/
-
UNDERLINE_COLOR
,
+
RESERVED_PROPERTY_04
,
/**
/**
- * @DEPRECATED_1_1.37 Use UNDERLINE instead
- * @brief Overrides the underline height from font metrics.
- * @details Name "underlineHeight", type Property::FLOAT.
+ * @brief This property is removed because it's deprecated.
*/
*/
-
UNDERLINE_HEIGHT
,
+
RESERVED_PROPERTY_05
,
/**
* @brief Whether the mark-up processing is enabled.
/**
* @brief Whether the mark-up processing is enabled.
@@
-337,7
+327,7
@@
public:
*/
AUTO_SCROLL_STOP_MODE,
*/
AUTO_SCROLL_STOP_MODE,
- /*
+ /*
*
* @brief The line count of text.
* @details name "lineCount", type Property::INTEGER.
* @SINCE_1_2.60
* @brief The line count of text.
* @details name "lineCount", type Property::INTEGER.
* @SINCE_1_2.60
@@
-507,4
+497,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_LABEL_H__
+#endif //
DALI_TOOLKIT_TEXT_LABEL_H