X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fradio-button-impl.h;h=1012196f73fea185c861b8b5279a68fbffda9956;hb=b514a4671789bee2f03b0177393b9a21f62ac2c3;hp=dc31882572e17ef412ad42bc0b9b211aaa34321f;hpb=2acdedcc7c7e732a9ec97d08c8cee7423ed6ebf7;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 dc31882..1012196 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -19,12 +19,11 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES -#include #include +#include #include "button-impl.h" namespace Dali @@ -41,74 +40,51 @@ 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(); - - /** - * Construct a new PushButton with label. - */ - RadioButton( const std::string& label ); +private: /** - * Construct a new PushButton with label. + * Construct a new RadioButton. */ - 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 - - /** - * @copydoc Dali::Toolkit::Button::SetSelected( bool selected ) - */ - virtual void SetSelected( bool selected ); +private: // From Button /** - * @copydoc Dali::Toolkit::Control::OnRelayout() + * @copydoc Toolkit::Internal::Button::OnInitialize */ - virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); - - protected: // From Control + virtual void OnInitialize(); /** - * Sets the relative position of image and label. + * @copydoc Toolkit::Internal::Button::OnStateChange */ - virtual void OnInitialize(); + virtual void OnStateChange( State newState ); - protected: // From Button /** - * Change button state when the button is pressed. + * @copydoc Toolkit::Internal::Button::OnToggleReleased */ - virtual void OnButtonUp(); + virtual bool OnToggleReleased(); - 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