[AT-SPI] Squashed implementation

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

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
index c283392..531b53b 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
-#define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#ifndef DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H
+#define DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H

 
 /*
 
 /*

- * Copyright (c) 2016 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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -68,32 +68,7 @@ private: // From Button
   /**
    * @copydoc Toolkit::Internal::Button::OnInitialize
    */
   /**
    * @copydoc Toolkit::Internal::Button::OnInitialize
    */

-  virtual void OnInitialize();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::PrepareForTranstionIn( Actor actor )
-   */
-  virtual void PrepareForTransitionIn( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::PrepareForTranstionOut( Actor actor )
-   */
-  virtual void PrepareForTransitionOut( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnTransitionInImage( Actor actor )
-   */
-  virtual void OnTransitionIn( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnTransitionOut( Actor actor )
-   */
-  virtual void OnTransitionOut( Actor actor );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnButtonVisualRemoval( Property::Index visualIndex )
-   */
- // virtual void OnButtonVisualRemoval( Property::Index visualIndex );
+  void OnInitialize() override;

 
 private:
 
 
 private:
 


@@ -102,7 +77,14 @@ private:
 
   // Undefined
   CheckBoxButton& operator=( const CheckBoxButton& );
 
   // Undefined
   CheckBoxButton& operator=( const CheckBoxButton& );

-
+protected:
+  struct AccessibleImpl : public Button::AccessibleImpl
+  {
+    using Button::AccessibleImpl::AccessibleImpl;
+
+    Dali::Accessibility::States CalculateStates() override;
+  };
+  void OnStateChange( State newState ) override;

 };
 
 } // namespace Internal
 };
 
 } // namespace Internal


@@ -131,4 +113,4 @@ inline const Toolkit::Internal::CheckBoxButton& GetImplementation( const Toolkit
 
 } // namespace Dali
 
 
 } // namespace Dali
 

-#endif // __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__
+#endif // DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H