[Tizen][AT-SPI] Make ReadingInfoTypes bindings independent of Control

A recent DALi change has moved AccessibilityAttributes and ReadingInfoTypes
from Control::Impl to Accessibility::Accessible. The updated bindings can now
be used for Layer as well.

Change-Id: I5438762ae8b71663037a621a766d26c9bce07553

diff --git a/dali-csharp-binder/src/control-devel-wrap.cpp b/dali-csharp-binder/src/control-devel-wrap.cpp
index d43c5f6..cb84a81 100644 (file)
--- a/dali-csharp-binder/src/control-devel-wrap.cpp
+++ b/dali-csharp-binder/src/control-devel-wrap.cpp
@@ -252,7 +252,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityR
   }));
 }
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType2(void* arg1, int arg2)
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_SetReadingInfoTypes(Dali::Actor* arg1_actor, int arg2)
 {
   using namespace Dali::Accessibility;
   static_assert(static_cast<int>(ReadingInfoType::NAME) == 0 &&
@@ -261,21 +261,22 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_SetAccessibilityRea
                   static_cast<int>(ReadingInfoType::STATE) == 3,
                 "C++ and C# bindings does not match");
 
-  GUARD_ON_NULL_RET(arg1);
+  GUARD_ON_NULL_RET(arg1_actor);
   try_catch(([&]() {
-    auto* control = (Dali::Toolkit::Control*)arg1;
-    SetAccessibilityReadingInfoType(*control, ReadingInfoTypes{static_cast<std::uint32_t>(arg2)});
+    ReadingInfoTypes readingInfoTypes(static_cast<std::uint32_t>(arg2));
+    Accessible::Get(*arg1_actor)->SetReadingInfoTypes(readingInfoTypes);
   }));
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Toolkit_DevelControl_GetAccessibilityReadingInfoType2(void* arg1)
+SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Accessibility_GetReadingInfoTypes(Dali::Actor* arg1_actor)
 {
+  using namespace Dali::Accessibility;
+
   int result = 0;
-  GUARD_ON_NULL_RET0(arg1);
+  GUARD_ON_NULL_RET0(arg1_actor);
   try_catch(([&]() {
-    auto* control     = (Dali::Toolkit::Control*)arg1;
-    auto  readingInfo = GetAccessibilityReadingInfoType(*control);
-    result            = readingInfo.GetRawData()[0];
+    ReadingInfoTypes readingInfoTypes = Accessible::Get(*arg1_actor)->GetReadingInfoTypes();
+    result = static_cast<int>(readingInfoTypes.GetRawData()[0]);
   }));
   return result;
 }