[dali_2.3.23] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / buttons / check-box-button.h

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 9322a46..9dafa28 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/check-box-button.h
+++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CHECK_BOX_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.
@@ -23,10 +23,8 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 // Forward declarations
 
 namespace Internal DALI_INTERNAL
@@ -61,7 +59,7 @@ class CheckBoxButton;
  *   CheckBoxButton button = CheckBoxButton::New();
  *   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 );
  *
@@ -81,7 +79,6 @@ class CheckBoxButton;
 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
 };