Fix AtspiAccessibility functions to apply to all profiles

- Revert "[ATSPI] Hotfix for common profile with ATSPI.IsEnabled()"
 This reverts commit b228f3f42e34dab1778664822253cc43c2ce77a3.

- Move atspi-wrap.cpp file to all profiles including Ubuntu build

Change-Id: I0b9a7d3f88cdef8321b275b7474173b0097d8787

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index a2bdbcf..a84d7c0 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -44,6 +44,7 @@ dali_csharp_binder_common_src_files = \
   ${dali_csharp_binder_dir}/src/control-devel-wrap.cpp \
   ${dali_csharp_binder_dir}/src/signal-wrap.cpp \
   ${dali_csharp_binder_dir}/src/accessible-impl-nui.cpp \
+  ${dali_csharp_binder_dir}/src/atspi-wrap.cpp \
   ${dali_csharp_binder_dir}/src/rotation-wrap.cpp \
   ${dali_csharp_binder_dir}/src/input-options-wrap.cpp \
   ${dali_csharp_binder_dir}/src/native-image-queue-wrap.cpp
@@ -57,7 +58,6 @@ dali_csharp_binder_tizen_src_files = \
   ${dali_csharp_binder_dir}/src/widget-view-manager-wrap.cpp \
   ${dali_csharp_binder_dir}/src/font-client-wrap.cpp \
   ${dali_csharp_binder_dir}/src/transition-effects-wrap.cpp \
-  ${dali_csharp_binder_dir}/src/atspi-wrap.cpp \
   ${dali_csharp_binder_dir}/src/component-application-wrap.cpp \
   ${dali_csharp_binder_dir}/src/tizen-dependency-wrap.cpp
 

diff --git a/dali-csharp-binder/src/atspi-wrap.cpp b/dali-csharp-binder/src/atspi-wrap.cpp
index 6b2f353..e1757b1 100755 (executable)
--- a/dali-csharp-binder/src/atspi-wrap.cpp
+++ b/dali-csharp-binder/src/atspi-wrap.cpp
@@ -164,6 +164,11 @@ SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_BridgeDisableAutoInit()
   Dali::Accessibility::Bridge::DisableAutoInit();
 }
 
+SWIGEXPORT bool SWIGSTDCALL csharp_dali_accessibility_IsEnabled()
+{
+  return Dali::AtspiAccessibility::IsEnabled();
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/dali-csharp-binder/src/control-devel-wrap.cpp b/dali-csharp-binder/src/control-devel-wrap.cpp
index 6e4785b..b8be85c 100644 (file)
--- a/dali-csharp-binder/src/control-devel-wrap.cpp
+++ b/dali-csharp-binder/src/control-devel-wrap.cpp
@@ -569,16 +569,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_Accessible_SetHighlightAct
     });
 }
 
-// atspi-wrap.cpp build only tizen profile, but this API could called for common profile.
-// TODO : It may need to moved some other file. Need to checkup
-SWIGEXPORT bool SWIGSTDCALL csharp_dali_accessibility_IsEnabled()
-{
-  // TODO : This file doesn't have Atspi namespace. In this file, It just call IsUp function.
-  //return Dali::AtspiAccessibility::IsEnabled();
-  return Dali::Accessibility::IsUp();
-}
-
-
 #ifdef __cplusplus
 } // extern "C"
 #endif