[dali_1.4.49] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / examples / simple-visuals-control / my-control-impl.cpp

diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp
index 7c8a602..b297aea 100644 (file)
--- a/examples/simple-visuals-control/my-control-impl.cpp
+++ b/examples/simple-visuals-control/my-control-impl.cpp
@@ -20,12 +20,11 @@
 
 // EXTERNAL INCLUDES
 
-#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/devel-api/scripting/enum-helper.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -102,7 +101,7 @@ void MyControl::SetProperty( BaseObject* object, Property::Index index, const Pr
 
         if ( iconVisual )
         {
-          impl.RegisterVisual( index, iconVisual );
+          DevelControl::RegisterVisual( impl, index, iconVisual );
         }
         break;
       }
@@ -123,7 +122,8 @@ Property::Value MyControl::GetProperty( BaseObject* object, Property::Index prop
       case Demo::MyControl::Property::ICON_VISUAL:
       {
         Property::Map map;
-        Toolkit::Visual::Base visual =  GetImpl( myControl ).GetVisual( propertyIndex );
+        MyControl& impl = GetImpl( myControl );
+        Toolkit::Visual::Base visual =  DevelControl::GetVisual( impl, propertyIndex );
         if ( visual )
         {
           visual.CreatePropertyMap( map ); // Creates a Property map containing the Visual that ICON_VISUAL currently is. Can change if state changes.