X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fcheck-box-button.h;h=9dafa28184c4099006ef00218b7ab7836ff36ea3;hb=HEAD;hp=301a8108d9be3f06c566e509b09bc78300573bdf;hpb=c1481543c3334342110f9a4635292d0eff1d15b7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h index 301a810..9dafa28 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ -#define __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ +#ifndef DALI_TOOLKIT_CHECK_BOX_BUTTON_H +#define DALI_TOOLKIT_CHECK_BOX_BUTTON_H /* - * Copyright (c) 2017 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - // Forward declarations namespace Internal DALI_INTERNAL @@ -59,9 +57,9 @@ class CheckBoxButton; * void HelloWorldExample::Create( Application& application ) * { * CheckBoxButton button = CheckBoxButton::New(); - * button.SetParentOrigin( ParentOrigin::CENTER ); + * button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * button.SetProperty( Button::Property::LABEL, "Check" ); - * button.SetSize( 200, 40 ); + * button.SetProperty( Actor::Property::SIZE, Vector2( 200, 40 ); * button.SetBackgroundColor( Color::WHITE ); * Stage::GetCurrent().Add( button ); * @@ -78,10 +76,9 @@ class CheckBoxButton; * @endcode * @SINCE_1_0.0 */ -class DALI_IMPORT_API CheckBoxButton : public Button +class DALI_TOOLKIT_API CheckBoxButton : public Button { public: - /** * @brief Creates an uninitialized CheckBoxButton; this can be initialized with CheckBoxButton::New(). * Calling member functions with an uninitialized Dali::Object is not allowed. @@ -94,7 +91,15 @@ public: * @SINCE_1_0.0 * @param[in] checkBox Handle to an object */ - CheckBoxButton( const CheckBoxButton& checkBox ); + CheckBoxButton(const CheckBoxButton& checkBox); + + /** + * @brief Move constructor + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + */ + CheckBoxButton(CheckBoxButton&& rhs) noexcept; /** * @brief Assignment operator. @@ -102,7 +107,16 @@ public: * @param[in] checkBox Handle to an object * @return A reference to this */ - CheckBoxButton& operator=( const CheckBoxButton& checkBox ); + CheckBoxButton& operator=(const CheckBoxButton& checkBox); + + /** + * @brief Move assignment + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + CheckBoxButton& operator=(CheckBoxButton&& rhs) noexcept; /** * @brief Destructor. @@ -128,24 +142,23 @@ public: * @param[in] handle Handle to an object * @return Handle to a CheckBoxButton or an uninitialized handle */ - static CheckBoxButton DownCast( BaseHandle handle ); + static CheckBoxButton DownCast(BaseHandle handle); public: // Not intended for application developers - /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The Control implementation */ - DALI_INTERNAL CheckBoxButton( Internal::CheckBoxButton& implementation ); + DALI_INTERNAL CheckBoxButton(Internal::CheckBoxButton& implementation); /** * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor */ - DALI_INTERNAL CheckBoxButton( Dali::Internal::CustomActor* internal ); + DALI_INTERNAL CheckBoxButton(Dali::Internal::CustomActor* internal); /// @endcond }; @@ -156,4 +169,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ +#endif // DALI_TOOLKIT_CHECK_BOX_BUTTON_H