X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=e1f837f199ae305eb3b865b1b03f15250f24c563;hb=refs%2Fchanges%2F49%2F34949%2F3;hp=9c0f89ab7a51bcdb6ab979bbb35b741b69992282;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 9c0f89a..e1f837f 100644
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -1,27 +1,30 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_ImageView_H__
 #define __DALI_TOOLKIT_INTERNAL_ImageView_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // EXTERNAL INCLUDES
-#include <boost/bind.hpp>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/common/map-wrapper.h>
+#include <dali/public-api/images/image-attributes.h>
+#include <dali/public-api/object/property-notification.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
@@ -41,7 +44,7 @@ typedef IntrusivePtr<ImageView>    ImageViewPtr;
 /**
  * @copydoc Toolkit::ImageView
  */
-class ImageView : public ControlImpl
+class ImageView : public Control
 {
 public:
 
@@ -135,6 +138,12 @@ protected:
    */
   virtual ~ImageView();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
 
   /**