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=0135e6b5b349b00d26ee6ac0b7aa3d68742c0064;hb=28d0de15155c9923010da5c53eb1a96cbf6cd6e4;hpb=1c5674a11a51310ee689d6daf4e6b7d94dec607e

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 0135e6b..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,10 +20,8 @@
 
 // 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/devel-api/shader-effects/image-region-effect.h>
@@ -70,51 +68,34 @@ private: // From Button
 
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize
    */
   virtual void OnButtonInitialize();
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnLabelSet()
-   */
-  virtual void OnLabelSet();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnSelected()
-   */
-  virtual bool OnSelected();
-
-  /**
-   * @copydoc Toolkit::Internal::Button::OnDisabled()
+   * @copydoc Toolkit::Internal::Button::OnLabelSet
    */
-  virtual bool OnDisabled();
+  virtual void OnLabelSet( bool noPadding );
 
   /**
-   * @copydoc Toolkit::Internal::Button::StopAllAnimations()
+   * @copydoc Toolkit::Internal::Button::OnDisabled
    */
-  virtual void StopAllAnimations();
-
-private:
+  virtual void OnDisabled();
 
   /**
-   * Adds the actor to the transition animation.
-   * It creates a transition animation if needed and starts the animation.
-   * @param[in] actor The actor.
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionIn( Actor actor )
    */
-  void StartTransitionAnimation( Actor& actor );
+  virtual void PrepareForTranstionIn( Actor actor );
 
   /**
-   * Stops the transition animation.
-   * @param[in] remove If true, removes the fadeout actor from root.
+   * @copydoc Toolkit::Internal::Button::PrepareForTranstionOut( Actor actor )
    */
-  void StopTransitionAnimation( bool remove = true );
-
-  // slots
+  virtual void PrepareForTranstionOut( Actor actor );
 
   /**
-   * Called when the transition animation finishes.
+   * @copydoc Toolkit::Internal::Button::OnTransitionInImage( Actor actor )
    */
-  void TransitionAnimationFinished( Dali::Animation& source );
+  virtual void OnTransitionIn( Actor actor );
 
 private:
 
@@ -125,7 +106,6 @@ private:
   CheckBoxButton& operator=( const CheckBoxButton& );
 
 private:
-  Animation                 mTransitionAnimation;  ///< Animation used in the state transitions.
   ShaderEffect              mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
 };