[dali_1.1.11] Merge branch 'devel/master'

[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 25945d2..e80b838 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h
@@ -64,21 +64,26 @@ private:
    */
   virtual ~CheckBoxButton();
 
+  /**
+   * Setup the ticking effect to the selected image.
+   */
+  void SetTickUVEffect();
+
 private: // From Button
 
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+   * @copydoc Toolkit::Internal::Button::OnButtonInitialize
    */
   virtual void OnButtonInitialize();
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnLabelSet()
+   * @copydoc Toolkit::Internal::Button::OnLabelSet
    */
-  virtual void OnLabelSet();
+  virtual void OnLabelSet( bool noPadding );
 
   /**
-   * @copydoc Toolkit::Internal::Button::OnDisabled()
+   * @copydoc Toolkit::Internal::Button::OnDisabled
    */
   virtual void OnDisabled();
 
@@ -106,7 +111,7 @@ private:
   CheckBoxButton& operator=( const CheckBoxButton& );
 
 private:
-  ShaderEffect              mTickUVEffect;         ///< ImageRegionEffect to expand the tick across
+  Actor         mSelectedImage;
 };
 
 } // namespace Internal