X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.h;h=169700130801935a0f15727c7aa55e3c03edd5b5;hp=9d4335a4a74d1d810dade2754e382685277a991c;hb=28d0de15155c9923010da5c53eb1a96cbf6cd6e4;hpb=928136dbb9e23970f3894eabc7c8b224003b77be

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 9d4335a..1697001 100644
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -20,11 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/shader-effects/shader-effect.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
-#include <dali-toolkit/public-api/shader-effects/image-region-effect.h>
+#include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
 
 #include "button-impl.h"
 
@@ -52,52 +52,6 @@ public:
    */
   static Dali::Toolkit::CheckBoxButton New();
 
-public: // From Button
-
-  /**
-   * @copydoc Toolkit::Internal::Button::SetSelectedImage( Actor image )
-   */
-  virtual void SetSelectedImage( Actor image );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::SetBackgroundImage( Actor image )
-   */
-  virtual void SetBackgroundImage( Actor image );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::SetDisabledSelectedImage( Actor image )
-   */
-  virtual void SetDisabledSelectedImage( Actor image );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::SetDisabledBackgroundImage( Actor image )
-   */
-  virtual void SetDisabledBackgroundImage( Actor image );
-
-private: // From Button
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnLabelSet()
-   */
-  virtual void OnLabelSet();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnSelected()
-   */
-  virtual void OnSelected( bool selected );
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnDisabled( bool disabled )
-   */
-  virtual void OnDisabled( bool disabled );
-
-private: // From Control
-
-  /**
-   * @copydoc Dali::Toolkit::Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
 private:
 
   /**
@@ -110,37 +64,38 @@ private:
    */
   virtual ~CheckBoxButton();
 
-private:
+private: // From Button
+
 
   /**
-   * Adds the actor to the button.
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize
    */
-  void AddChild( Actor& actor );
+  virtual void OnButtonInitialize();
 
   /**
-   * Removes the actor from the button.
+   * @copydoc Toolkit::Internal::Button::OnLabelSet
    */
-  void RemoveChild( Actor& actor );
+  virtual void OnLabelSet( bool noPadding );
 
   /**
-   * Adds the actor to the check in animation.
-   * It creates a check in animation if needed and starts the check in animation.
-   * @param[in] actor The actor.
+   * @copydoc Toolkit::Internal::Button::OnDisabled
    */
-  void StartCheckInAnimation( Actor& actor );
+  virtual void OnDisabled();
 
   /**
-   * Stops the check in animation.
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionIn( Actor actor )
    */
-  void StopCheckInAnimation();
+  virtual void PrepareForTranstionIn( Actor actor );
 
-  // slots
+  /**
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionOut( Actor actor )
+   */
+  virtual void PrepareForTranstionOut( Actor actor );
 
   /**
-   * Called when the check in animation finishes.
-   * It changes the check button paint state.
+   * @copydoc Toolkit::Internal::Button::OnTransitionInImage( Actor actor )
    */
-  void CheckInAnimationFinished( Dali::Animation& source );
+  virtual void OnTransitionIn( Actor actor );
 
 private:
 
@@ -151,10 +106,7 @@ private:
   CheckBoxButton& operator=( const CheckBoxButton& );
 
 private:
-  Animation                 mCheckInAnimation;  ///< Animation used in the state transitions.
-  ImageRegionEffect         mTickUVEffect;      ///< ImageRegionEffect to expand the tick across
-
-  PaintState                mPaintState;        ///< The paint state.
+  ShaderEffect              mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
 };
 
 } // namespace Internal