X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fimage-view%2Fimage-view.cpp;h=e3d2b67a78a7d99bd4f9301827848dc273931d4f;hb=615572d21ca43c37388d9de980a8d1265e8c21fd;hp=8075764eb5b6c540ed147959e22074bb8789d818;hpb=e80261307788b4656435c4dd964beff7c85e7e8c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/image-view/image-view.cpp b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index 8075764..e3d2b67 100644
--- a/dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/dali-toolkit/public-api/controls/image-view/image-view.cpp
@@ -16,14 +16,15 @@
  */
 
 // CLASS HEADER
-
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/resource-image.h>
+#include <dali/public-api/object/property-map.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
 
-// EXTERNAL INCLUDES
-
 namespace Dali
 {
 
@@ -61,19 +62,19 @@ ImageView ImageView::New( Image image )
 {
   ImageView imageView = Internal::ImageView::New();
   imageView.SetImage( image );
-  return imageView;
+  return ImageView( imageView );
 }
 
 ImageView ImageView::New( const std::string& url )
 {
   ImageView imageView = Internal::ImageView::New();
-  imageView.SetProperty( ImageView::Property::RESOURCE_URL, Dali::Property::Value( url ) );
+  imageView.SetImage( url );
   return imageView;
 }
 
 ImageView ImageView::DownCast( BaseHandle handle )
 {
-  return Control::DownCast<ImageView, Internal::ImageView>(handle);
+  return Control::DownCast<ImageView, Internal::ImageView>( handle );
 }
 
 void ImageView::SetImage( Image image )
@@ -81,9 +82,14 @@ void ImageView::SetImage( Image image )
   Dali::Toolkit::GetImpl( *this ).SetImage( image );
 }
 
+void ImageView::SetImage( const std::string& url )
+{
+  Dali::Toolkit::GetImpl( *this ).SetImage( url );
+}
+
 Image ImageView::GetImage() const
 {
-  return Dali::Toolkit::GetImpl( *this ).GetImage();
+  return Image();
 }
 
 ImageView::ImageView( Internal::ImageView& implementation )