Merge "Adding RegisterVisual API to Control base class" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / buttons / check-box-button-impl.cpp

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index 44d62a5..6607c5c 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -23,8 +23,8 @@
 #include <dali/public-api/images/resource-image.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/shader-effects/image-region-effect.h>
 
 namespace Dali
@@ -93,12 +93,14 @@ void CheckBoxButton::SetTickUVEffect()
     Property::Map shaderMap = CreateImageRegionEffect();
     imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderMap );
 
-    GetImpl( imageView ).SetDepthIndex( DECORATION_DEPTH_INDEX );
+    GetImpl( imageView ).SetDepthIndex( DepthIndex::DECORATION );
   }
 }
 
-void CheckBoxButton::OnButtonInitialize()
+void CheckBoxButton::OnInitialize()
 {
+  Button::OnInitialize();
+
   // Wrap around all children
   Self().SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );