[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 0b33685..a855b2d 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -139,6 +139,18 @@ Toolkit::DevelControl::AccessibilityReadingSkippedSignalType &AccessibilityReadi
   return ac->mAccessibilityReadingSkippedSignal;
 }
 
+Toolkit::DevelControl::AccessibilityReadingPausedSignalType &AccessibilityReadingPausedSignal( Toolkit::Control control )
+{
+  auto ac = GetControlImplementationIfAny ( control );
+  return ac->mAccessibilityReadingPausedSignal;
+}
+
+Toolkit::DevelControl::AccessibilityReadingResumedSignalType &AccessibilityReadingResumedSignal( Toolkit::Control control )
+{
+  auto ac = GetControlImplementationIfAny ( control );
+  return ac->mAccessibilityReadingResumedSignal;
+}
+
 Toolkit::DevelControl::AccessibilityReadingCancelledSignalType &AccessibilityReadingCancelledSignal( Toolkit::Control control )
 {
   auto ac = GetControlImplementationIfAny ( control );
@@ -287,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();
   }
@@ -298,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();
   }
@@ -309,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();
   }
@@ -320,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 );
   }
 }