X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.h;h=d525a43dd16ef038992051a7232e081715bd78d2;hb=a6f34ab2df1f2418c037366030a4dcfbcda29847;hp=ba5a79e6d327a84bb29e7f5d8f74c473078bc032;hpb=1db0a8becea3dbdebaa942d934d91824a92434e7;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 ba5a79e..d525a43 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include "button-impl.h" namespace Dali @@ -40,74 +41,56 @@ namespace Internal */ class RadioButton: public Button { - public: +public: /** * Create a new RadioButton. * - * @return A smart-pointer to the newly allocated PushButton. + * @return A smart-pointer to the newly allocated RadioButton. */ static Dali::Toolkit::RadioButton New(); - /** - * Construct a new PushButton. - */ - RadioButton(); +private: /** - * Construct a new PushButton with label. + * Construct a new RadioButton. */ - RadioButton( const std::string& label ); - - /** - * Construct a new PushButton with label. - */ - RadioButton( Actor label ); + RadioButton(); /** * A reference counted object may only be deleted by calling Unreference() */ virtual ~RadioButton(); - /** - * @copydoc Dali::Toolkit::Button::SetLabel( Actor label ) - */ - virtual void SetLabel( Actor label ); // TODO: After refactoring painter, this will be removed +private: // From Button /** - * @copydoc Dali::Toolkit::Button::SetSelected( bool selected ) + * @copydoc Toolkit::Internal::Button::OnButtonInitialize() */ - virtual void SetSelected( bool selected ); + virtual void OnButtonInitialize(); /** - * @copydoc Dali::Toolkit::Control::OnRelayout() + * @copydoc Toolkit::Internal::Button::OnButtonUp() */ - virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); - - protected: // From Control + virtual void OnButtonUp(); /** - * Sets the relative position of image and label. + * @copydoc Toolkit::Internal::Button::OnSelected() */ - virtual void OnInitialize(); + virtual bool OnSelected(); - protected: // From Button /** - * Change button state when the button is pressed. + * @copydoc Toolkit::Internal::Button::OnLabelSet() */ - virtual void OnButtonUp(); + virtual void OnLabelSet(); - private: +private: // Undefined RadioButton( const RadioButton& origin ); // Undefined RadioButton& operator=( const RadioButton& origin ); - - Image mUnselectedImage; ///< Stores the unselected image - Image mSelectedImage; ///< Stores the selected image - ImageActor mRadioIcon; ///< Stores the current image }; } // namespace Internal