X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.h;h=e9c0f14bd6c61fc482acb9d05d7e45c1d9fb720d;hp=0915d3e35eb28f94f7c85041cec0e7e894aa5afb;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=c0d8c3caf853d94266c589b425cadc26333f716a diff --git a/dali-toolkit/internal/controls/buttons/button-impl.h b/dali-toolkit/internal/controls/buttons/button-impl.h index 0915d3e..e9c0f14 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.h +++ b/dali-toolkit/internal/controls/buttons/button-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_BUTTON_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -329,15 +329,15 @@ protected: // From Control virtual bool OnKeyboardEnter(); /** - * @copydoc Toolkit::Control::OnStageDisconnection() - * @note If overridden by deriving button classes, then an up-call to Button::OnStageDisconnection MUST be made at the end. + * @copydoc Toolkit::Control::OnSceneDisconnection() + * @note If overridden by deriving button classes, then an up-call to Button::OnSceneDisconnection MUST be made at the end. */ - virtual void OnStageDisconnection(); + virtual void OnSceneDisconnection(); /** - * @copydoc Toolkit::Control::OnStageConnnection() + * @copydoc Toolkit::Control::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + virtual void OnSceneConnection( int depth ); /** * @copydoc Toolkit::Control::GetNaturalSize @@ -362,7 +362,7 @@ private: * @param[in] touch The touch info. * @return true, if consumed, false otherwise. */ - bool OnTouch( Actor actor, const TouchData& touch ); + bool OnTouch( Actor actor, const TouchEvent& touch ); /** * Handler for tap events.