[AT-SPI] Squashed implementation

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

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 (file)
--- 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