X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=bc2459fd7d19a41d7f7b5ed696764817a0907707;hb=e65245a8ddc5d1fe018b4f890c6927974955e2a7;hp=c2dd4856e5212983e3729d02410365d4c836122d;hpb=00fdaec1c1d0ae69756e720ac5d3bc3acc5bd2a9;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 c2dd485..bc2459f 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H +#define DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -21,6 +21,7 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include @@ -94,31 +95,13 @@ private: // From Control */ virtual float GetHeightForWidth( float width ); - /** - * @copydoc Text::ControlInterface::AddDecoration() - */ - virtual void AddDecoration( Actor& actor, bool needsClipping ); - - /** - * @copydoc Control::OnStageConnection() - */ - virtual void OnStageConnection( int depth ); +// From ControlInterface /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ virtual void RequestTextRelayout(); - /** - * @copydoc Text::ControlInterface::TextChanged() - */ - virtual void TextChanged(); - - /** - * @copydoc Text::ControlInterface::MaxLengthReached() - */ - virtual void MaxLengthReached(); - private: // from TextScroller /** @@ -193,4 +176,4 @@ inline const Toolkit::Internal::TextLabel& GetImpl( const Toolkit::TextLabel& te } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H