Merge "fix wrong description in text-style" into devel/master

diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index 7b497c9..5ab6b79 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -337,11 +337,6 @@ void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::St
   }
 }
 
-Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control)
-{
-  return Dali::Accessibility::Accessible::Get(control);
-}
-
 } // namespace DevelControl
 
 } // namespace Toolkit

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index 33e02f5..b188b9b 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -580,13 +580,6 @@ DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Dali::Actor control, Dali::
   */
 DALI_TOOLKIT_API void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor);
 
-/**
- * Returns accessibility object bound to actor, if any
- *
- * This method won't bound new accessibility object. Use Dali::Accessibility::Accessible::Get in that case.
- */
-DALI_TOOLKIT_API Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control);
-
 } // namespace DevelControl
 
 } // namespace Toolkit