X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.cpp;h=85fe1a6699d55309ab3ccb2b0e03f1da111f2361;hp=e252ea5e0074cc974329aae1b302107c0545cc2e;hb=7957e6e4dd4c6f97a7296d3125c7410a4b6bc5d7;hpb=1123d866f9342b8950fe63715f6eaa1be9a2c18f diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index e252ea5..85fe1a6 100644 --- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp @@ -16,15 +16,14 @@ */ // CLASS HEADER - #include "check-box-button-impl.h" // EXTERNAL INCLUDES - #include +#include +#include // INTERNAL INCLUDES - #include "check-box-button-default-painter-impl.h" namespace Dali @@ -218,7 +217,7 @@ float CheckBoxButton::OnAnimationTimeRequested() const void CheckBoxButton::OnActivated() { // When the button is activated, it performs the click action - std::vector attributes; + PropertyValueContainer attributes; DoClickAction(attributes); } @@ -234,7 +233,7 @@ void CheckBoxButton::DoClickAction(const PropertyValueContainer& attributes) } } -bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false; @@ -254,7 +253,9 @@ bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, CheckBoxButton::CheckBoxButton() : Button(), mChecked( false ), - mClickActionPerforming(false) + mClickActionPerforming(false), + mUseFadeAnimationProperty(Property::INVALID_INDEX), + mUseCheckAnimationProperty(Property::INVALID_INDEX) { // Creates specific painter. mPainter = new CheckBoxButtonDefaultPainter();