fixing some of the comments and changing copy-by-value to by reference in size negoti...

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / buttons / radio-button-impl.h

diff --git a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index 5afa145..07c622b 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/base/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -18,15 +18,13 @@
  *
  */
 
-// INTERNAL INCLUDES
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/dali-vector.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-view/text-view.h>
-
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
-
-#include <dali/public-api/common/dali-vector.h>
-
 #include "button-impl.h"
 
 namespace Dali
@@ -88,14 +86,14 @@ class RadioButton: public Button
   Actor GetLabel() const;
 
   /**
-   * @copydoc Dali::Toolkit::RadioButton::SetActive(bool active)
+   * @copydoc Dali::Toolkit::RadioButton::SetSelected(bool selected)
    */
-  void SetActive(bool active);
+  void SetSelected(bool selected);
 
   /**
-   * @copydoc Dali::Toolkit::RadioButton::IsActive()
+   * @copydoc Dali::Toolkit::RadioButton::IsSelected()
    */
-  bool IsActive()const;
+  bool IsSelected()const;
 
   /**
    * @copydoc Dali::Toolkit::RadioButton::ToggleState()
@@ -103,9 +101,9 @@ class RadioButton: public Button
   void ToggleState();
 
   /**
-   * @copydoc Dali::Toolkit::Control::OnRelaidOut(Vector2 size, ActorSizeContainer& container)
+   * @copydoc Dali::Toolkit::Control::OnRelayout()
    */
-  virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
  public:
   // Properties
@@ -141,11 +139,11 @@ class RadioButton: public Button
   // Undefined
   RadioButton& operator=(const RadioButton& origin);
 
-  Image mInactiveImage;     ///< Stores the inactive image
-  Image mActiveImage;       ///< Stores the active image
+  Image mUnselectedImage;  ///< Stores the unselected image
+  Image mSelectedImage;    ///< Stores the selected image
   ImageActor mRadioIcon;   ///< Stores the current image
-  Actor mLabel;             ///< Stores the button label
-  bool mActive;             ///< Stores the active state
+  Actor mLabel;            ///< Stores the button label
+  bool mSelected;          ///< Stores the selected state
 } ;
 
 } // namespace Internal