X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.h;h=b1727502c673b2fbddfd3a04f638728d85c9849b;hb=c292286209afcff183cb6272e5429126b33bfd08;hp=1012196f73fea185c861b8b5279a68fbffda9956;hpb=6c664b09beef66ee4e223cf30fb17ecdd6889bf7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h index 1012196..b172750 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ -#define __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ +#ifndef DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H +#define DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -22,8 +22,8 @@ #include // INTERNAL INCLUDES +#include #include -#include #include "button-impl.h" namespace Dali @@ -32,16 +32,14 @@ namespace Toolkit { namespace Internal { - /** * RadioButton implementation class. * * \sa Dali::Toolkit::RadioButton */ -class RadioButton: public Button +class RadioButton : public Button { public: - /** * Create a new RadioButton. * @@ -50,7 +48,6 @@ public: static Dali::Toolkit::RadioButton New(); private: - /** * Construct a new RadioButton. */ @@ -62,29 +59,35 @@ private: virtual ~RadioButton(); private: // From Button - /** * @copydoc Toolkit::Internal::Button::OnInitialize */ - virtual void OnInitialize(); + void OnInitialize() override; /** * @copydoc Toolkit::Internal::Button::OnStateChange */ - virtual void OnStateChange( State newState ); + void OnStateChange(State newState) override; /** * @copydoc Toolkit::Internal::Button::OnToggleReleased */ - virtual bool OnToggleReleased(); + bool OnToggleReleased() override; private: - // Undefined - RadioButton( const RadioButton& origin ); + RadioButton(const RadioButton& origin); // Undefined - RadioButton& operator=( const RadioButton& origin ); + RadioButton& operator=(const RadioButton& origin); + +protected: + struct AccessibleImpl : public Button::AccessibleImpl + { + using Button::AccessibleImpl::AccessibleImpl; + + Dali::Accessibility::States CalculateStates() override; + }; }; } // namespace Internal @@ -97,7 +100,7 @@ inline Toolkit::Internal::RadioButton& GetImplementation(Toolkit::RadioButton& b Dali::RefObject& handle = button.GetImplementation(); - return static_cast (handle); + return static_cast(handle); } inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::RadioButton& button) @@ -106,10 +109,10 @@ inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra const Dali::RefObject& handle = button.GetImplementation(); - return static_cast (handle); + return static_cast(handle); } } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ +#endif // DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H