X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fshadow-view%2Fshadow-view.h;h=f9142feed8367d344b45759ea82724a7b37a10b1;hb=refs%2Fchanges%2F99%2F38499%2F2;hp=1d8a898a9258721611c5a1e8b592803fddcf6a6e;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
index 1d8a898..f9142fe 100644
--- a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
+++ b/dali-toolkit/public-api/controls/shadow-view/shadow-view.h
@@ -1,28 +1,30 @@
 #ifndef __DALI_TOOLKIT_SHADOW_VIEW_H__
 #define __DALI_TOOLKIT_SHADOW_VIEW_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) 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.
+ * 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 <dali/public-api/actors/image-actor.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -100,7 +102,7 @@ class ShadowView;
  *  shadowView.Deactivate();
  *  @endcode
  */
-class ShadowView : public Control
+class DALI_IMPORT_API ShadowView : public Control
 {
 public:
 
@@ -121,9 +123,11 @@ public:
   ShadowView& operator=(const ShadowView& view);
 
   /**
-   * Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ShadowView();
+  ~ShadowView();
 
   /**
    * Downcast an Object handle to ShadowView. If handle points to a ShadowView the
@@ -226,14 +230,14 @@ public:
    * This property represents a value in the range [0.0 - 1.0] where 0.0 is no blur and 1.0 is full blur. Default 0.2.
    * @return The property index that can be used with e.g. AnimateTo( ... )
    */
-  Property::Index GetBlurStrengthPropertyIndex() const;
+  Dali::Property::Index GetBlurStrengthPropertyIndex() const;
 
   /**
    * Get the property index that controls the color of the shadow. Useful for animating this property.
    * This property represents a value in the Vector4 format. Default color value is Vector4(0.2f, 0.2f, 0.2f, 0.8f) (i.e grey color).
    * @return The property index that can be used with e.g. AnimateTo( ... )
    */
-  Property::Index GetShadowColorPropertyIndex() const;
+  Dali::Property::Index GetShadowColorPropertyIndex() const;
 
 
 public:
@@ -242,13 +246,13 @@ public:
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The UI Control implementation.
    */
-  ShadowView( Internal::ShadowView& implementation );
+  DALI_INTERNAL ShadowView( Internal::ShadowView& implementation );
 
   /**
    * Allows the creation of this UI Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  ShadowView( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ShadowView( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit