X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fcheck-box-button.cpp;h=de1c2b0092e5ee83a338c38e8f100e3b64dfb968;hp=b28845186d786b76a5abfb15004daf4d9ef2bbeb;hb=68106e2cbb8541c18a77f39770ea7759f44e02a0;hpb=dc3613bb6248908c267a76e378b04962bce85664 diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp index b288451..de1c2b0 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.cpp +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -22,6 +22,7 @@ // INTERNAL INCLUDES #include +#include namespace Dali { @@ -64,7 +65,7 @@ CheckBoxButton CheckBoxButton::DownCast( BaseHandle handle ) void CheckBoxButton::SetBackgroundImage( Image image ) { - Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image ); + Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( ImageActor::New( image ) ); } void CheckBoxButton::SetBackgroundImage( Actor image ) @@ -79,7 +80,7 @@ Actor CheckBoxButton::GetBackgroundImage() const void CheckBoxButton::SetSelectedImage( Image image ) { - Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image ); + Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( ImageActor::New( image ) ); } void CheckBoxButton::SetSelectedImage( Actor image ) @@ -87,7 +88,6 @@ void CheckBoxButton::SetSelectedImage( Actor image ) Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image ); } - Actor CheckBoxButton::GetSelectedImage() const { return Dali::Toolkit::GetImplementation( *this ).GetSelectedImage(); @@ -95,7 +95,7 @@ Actor CheckBoxButton::GetSelectedImage() const void CheckBoxButton::SetDisabledBackgroundImage( Image image ) { - Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image ); + Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( ImageActor::New( image ) ); } void CheckBoxButton::SetDisabledBackgroundImage( Actor image ) @@ -110,7 +110,7 @@ Actor CheckBoxButton::GetDisabledBackgroundImage() const void CheckBoxButton::SetDisabledSelectedImage( Image image ) { - Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( image ); + Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( ImageActor::New( image ) ); } void CheckBoxButton::SetDisabledSelectedImage( Actor image )