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
[dali_1.9.32] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
17bf6e5
..
bdbdbbc
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-78,27
+78,27
@@
private: // From Control
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- v
irtual void OnInitialize() override
;
+ v
oid OnInitialize() override
;
/**
* @copydoc Control::OnStyleChange()
*/
/**
* @copydoc Control::OnStyleChange()
*/
- v
irtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override
;
+ v
oid OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override
;
/**
* @copydoc Control::OnRelayout()
*/
/**
* @copydoc Control::OnRelayout()
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @copydoc Control::GetNaturalSize()
*/
/**
* @copydoc Control::GetNaturalSize()
*/
-
virtual Vector3 GetNaturalSize() override
;
+
Vector3 GetNaturalSize() override
;
/**
* @copydoc Control::GetHeightForWidth()
*/
/**
* @copydoc Control::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width ) override
;
+
float GetHeightForWidth( float width ) override
;
/**
* @copydoc Control::OnPropertySet()
/**
* @copydoc Control::OnPropertySet()
@@
-110,14
+110,14
@@
private: // From Control
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
- v
irtual void RequestTextRelayout() override
;
+ v
oid RequestTextRelayout() override
;
private: // from TextScroller
/**
* @copydoc Text::ScrollerInterface::ScrollingFinished()
*/
private: // from TextScroller
/**
* @copydoc Text::ScrollerInterface::ScrollingFinished()
*/
- v
irtual void ScrollingFinished()
;
+ v
oid ScrollingFinished() override
;
private: // Implementation
private: // Implementation