Pass shared_ptr to Register/UnregisterDefaultLabel

Change-Id: I8e10353487a4268049fab5874984cc6b31acd902

diff --git a/dali-csharp-binder/common/nui-view-accessible.cpp b/dali-csharp-binder/common/nui-view-accessible.cpp
index f9f1970..1385e47 100644 (file)
--- a/dali-csharp-binder/common/nui-view-accessible.cpp
+++ b/dali-csharp-binder/common/nui-view-accessible.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 
 // INTERNAL INCLUDES
 #include <dali-csharp-binder/dali-toolkit/control-devel-wrap.h>
@@ -744,8 +745,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_DetachAccessibleObject(Dal
       // Call detach only if accessible was created before.
       if(DevelControl::IsAccessibleCreated(control))
       {
-        auto* actorAccessible = Dali::Accessibility::Accessible::Get(control);
-        auto* viewAccessible  = dynamic_cast<NUIViewAccessible*>(actorAccessible);
+        auto actorAccessible = Dali::Accessibility::Accessible::GetOwningPtr(control);
+        auto viewAccessible  = std::dynamic_pointer_cast<NUIViewAccessible>(actorAccessible);
 
         if(viewAccessible)
         {

diff --git a/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp b/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
index ecaf8f3..04551bd 100644 (file)
--- a/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
+++ b/dali-csharp-binder/dali-toolkit/control-devel-wrap.cpp
@@ -28,6 +28,7 @@
 #include <dali-toolkit/devel-api/visuals/animated-vector-image-visual-signals-devel.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 #include <string>
 
 using namespace Dali;
@@ -498,7 +499,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_Bridge_RegisterDefaultLabe
   GUARD_ON_NULL_RET(arg1_actor);
   try_catch(([&]() {
     Dali::Actor* actor      = (Dali::Actor*)arg1_actor;
-    auto         accessible = Dali::Accessibility::Accessible::Get(*actor);
+    auto         accessible = Dali::Accessibility::Accessible::GetOwningPtr(*actor);
     auto         bridge     = Dali::Accessibility::Bridge::GetCurrentBridge();
 
     if(!accessible)
@@ -516,7 +517,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_Bridge_UnregisterDefaultLa
   GUARD_ON_NULL_RET(arg1_actor);
   try_catch(([&]() {
     Dali::Actor* actor      = (Dali::Actor*)arg1_actor;
-    auto         accessible = Dali::Accessibility::Accessible::Get(*actor);
+    auto         accessible = Dali::Accessibility::Accessible::GetOwningPtr(*actor);
     auto         bridge     = Dali::Accessibility::Bridge::GetCurrentBridge();
 
     if(!accessible)