X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=f15acbf70c5874f52e30dc18019e3f207e3c3ad5;hb=e9333cfe318586fd503495e28b0d71c0dac4888a;hp=bc2459fd7d19a41d7f7b5ed696764817a0907707;hpb=cd2db445fc95fed65cb9d966e672cb6976a10d0d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 bc2459f..f15acbf 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -73,34 +73,39 @@ private: // From Control /** * @copydoc Control::OnInitialize() */ - virtual void OnInitialize(); + virtual void OnInitialize() override ; /** * @copydoc Control::OnStyleChange() */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); + virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override ; /** * @copydoc Control::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override ; /** * @copydoc Control::GetNaturalSize() */ - virtual Vector3 GetNaturalSize(); + virtual Vector3 GetNaturalSize() override ; /** * @copydoc Control::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + virtual float GetHeightForWidth( float width ) override ; -// From ControlInterface + /** + * @copydoc Control::OnPropertySet() + */ + virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override ; + + // From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ - virtual void RequestTextRelayout(); + virtual void RequestTextRelayout() override ; private: // from TextScroller