X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.h;h=1db13d50a4a932262ef67a19d5ebf09533775f16;hp=d7e91d3af1357bd3cbfbf118eb3b02139a8e7adc;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=b97b29c76acefabbae2c0a4e9ecc261bf9dd8036 diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h index d7e91d3..1db13d5 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -93,54 +93,12 @@ public: */ static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex ); - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetButtonImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetBackgroundImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetSelectedImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetSelectedBackgroundImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetDisabledBackgroundImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetDisabledImage( Actor image ); - - /** - * Deprecated API for Setting Pushbutton image using an Actor - * @param[in] image, Image Actor that has a url which can be used to create an image visual - */ - void SetDisabledSelectedImage( Actor image ); - private: // From Button /** * @copydoc Toolkit::Internal::Button::OnInitialize */ - virtual void OnInitialize(); + void OnInitialize() override; private: @@ -169,6 +127,15 @@ private: private: IconAlignment mIconAlignment; ///< The alignment of the icon against the label. + +protected: + struct AccessibleImpl : public Button::AccessibleImpl + { + using Button::AccessibleImpl::AccessibleImpl; + + Dali::Accessibility::States CalculateStates() override; + }; + void OnStateChange( State newState ) override; }; } // namespace Internal