X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.h;h=1db13d50a4a932262ef67a19d5ebf09533775f16;hb=ed11499452da1ccd5fdfa36324881dc66a5281bc;hp=6417b4b0247f7b8048f19b1ee03892cda416dc4f;hpb=33e8a1f0bd187a0d6edbc647e632ef61bc555077;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h
index 6417b4b..1db13d5 100644
--- a/dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
-#define __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
+#ifndef DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H
+#define DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -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
@@ -197,4 +164,4 @@ inline const Toolkit::Internal::PushButton& GetImplementation( const Toolkit::Pu
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__
+#endif // DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H