[AT-SPI] Windows fixes

Change-Id: I0244142f3de99777e0e3dd2e68fa820825c809fb

diff --git a/dali/devel-api/adaptor-framework/accessibility.h b/dali/devel-api/adaptor-framework/accessibility.h
index 49fcf1e..a6e373e 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility.h
+++ b/dali/devel-api/adaptor-framework/accessibility.h
@@ -298,8 +298,8 @@ enum class State : uint32_t
  */\r
 enum class TextChangedState : uint32_t\r
 {\r
-  INSERT,\r
-  DELETE,\r
+  INSERTED,\r
+  DELETED,\r
   MAX_COUNT\r
 };\r
 \r
@@ -435,7 +435,7 @@ enum class ReadingInfoType
  * @see Dali::Accessibility::Accessible::GetRoles\r
  */\r
 template < size_t I, typename S >\r
-class DALI_ADAPTOR_API BitSets\r
+class BitSets\r
 {\r
   std::array< uint32_t, I > data;\r
 \r

diff --git a/dali/internal/accessibility/bridge/accessible.cpp b/dali/internal/accessibility/bridge/accessible.cpp
index 24679e7..f23e33f 100644 (file)
--- a/dali/internal/accessibility/bridge/accessible.cpp
+++ b/dali/internal/accessibility/bridge/accessible.cpp
@@ -118,13 +118,13 @@ void Accessible::EmitFocused(bool set)
 void Accessible::EmitTextInserted(unsigned int position, unsigned int length, const std::string& content)
 {
     if (auto b = GetBridgeData()) {
-        b->bridge->EmitTextChanged(this, TextChangedState::INSERT, position, length, content);
+        b->bridge->EmitTextChanged(this, TextChangedState::INSERTED, position, length, content);
     }
 }
 void Accessible::EmitTextDeleted(unsigned int position, unsigned int length, const std::string& content)
 {
     if (auto b = GetBridgeData()) {
-        b->bridge->EmitTextChanged(this, TextChangedState::DELETE, position, length, content);
+        b->bridge->EmitTextChanged(this, TextChangedState::DELETED, position, length, content);
     }
 }
 void Accessible::EmitTextCaretMoved(unsigned int cursorPosition)

diff --git a/dali/internal/accessibility/bridge/bridge-object.cpp b/dali/internal/accessibility/bridge/bridge-object.cpp
index 2b8969d..2a0d03e 100644 (file)
--- a/dali/internal/accessibility/bridge/bridge-object.cpp
+++ b/dali/internal/accessibility/bridge/bridge-object.cpp
@@ -539,12 +539,12 @@ void BridgeObject::EmitTextChanged( Accessible* obj, TextChangedState state, uns
   const char* stateName = nullptr;
   switch( state )
   {
-    case TextChangedState::INSERT:
+    case TextChangedState::INSERTED:
     {
       stateName = "insert";
       break;
     }
-    case TextChangedState::DELETE:
+    case TextChangedState::DELETED:
     {
       stateName = "delete";
       break;