[AT-SPI] Windows fixes

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / control-devel.cpp

diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index 34ffc19..a855b2d 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -299,7 +299,7 @@ bool ClearAccessibilityHighlight( Dali::Actor control )
 {
   if ( auto ac = GetControlImplementationIfAny ( control ) )
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac );
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
     if( ptr )
       return ptr->ClearHighlight();
   }
@@ -310,7 +310,7 @@ bool GrabAccessibilityHighlight( Dali::Actor control )
 {
   if ( auto ac = GetControlImplementationIfAny ( control ) )
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac );
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
     if( ptr )
       return ptr->GrabHighlight();
   }
@@ -321,7 +321,7 @@ Dali::Accessibility::States GetAccessibilityStates( Dali::Actor control )
 {
   if ( auto ac = GetControlImplementationIfAny ( control ) )
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac );
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
     if(ptr)
       return ptr->GetStates();
   }
@@ -332,7 +332,7 @@ void NotifyAccessibilityStateChange( Dali::Actor control, Dali::Accessibility::S
 {
   if ( auto ac = GetControlImplementationIfAny ( control ) )
   {
-    ac->GetAccessibilityObject()->NotifyAccessibilityStateChange( states, doRecursive );
+    ac->GetAccessibilityObject()->NotifyAccessibilityStateChange( std::move(states), doRecursive );
   }
 }