Merge "Support multiple surfaces for partial update" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / input / windows / input-method-context-impl-win.cpp

diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp
index f3deb99..a26c90a 100755 (executable)
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -247,7 +247,7 @@ void InputMethodContextWin::NotifyTextInputMultiLine( bool multiLine )
 \r
 Dali::InputMethodContext::TextDirection InputMethodContextWin::GetTextDirection()\r
 {\r
-  Dali::InputMethodContext::TextDirection direction ( Dali::InputMethodContext::LeftToRight );\r
+  Dali::InputMethodContext::TextDirection direction ( Dali::InputMethodContext::LEFT_TO_RIGHT );\r
 \r
   return direction;\r
 }\r
@@ -339,14 +339,14 @@ bool InputMethodContextWin::FilterEventKey( const Dali::KeyEvent& keyEvent )
 {\r
   bool eventHandled( false );\r
 \r
-  if ( ! KeyLookup::IsDeviceButton( keyEvent.keyPressedName.c_str() ))\r
+  if ( ! KeyLookup::IsDeviceButton( keyEvent.GetKeyName().c_str() ))\r
   {\r
     //check whether it's key down or key up event\r
-    if ( keyEvent.state == KeyEvent::Down )\r
+    if ( keyEvent.GetState() == Dali::KeyEvent::DOWN )\r
     {\r
       eventHandled = ProcessEventKeyDown( keyEvent );\r
     }\r
-    else if ( keyEvent.state == KeyEvent::Up )\r
+    else if ( keyEvent.GetState() == Dali::KeyEvent::UP )\r
     {\r
       eventHandled = ProcessEventKeyUp( keyEvent );\r
     }\r
@@ -377,13 +377,13 @@ void InputMethodContextWin::GetPreeditStyle( Dali::InputMethodContext::PreEditAt
   attrs = mPreeditAttrs;\r
 }\r
 \r
-bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )\r
+bool InputMethodContextWin::ProcessEventKeyDown( const Dali::KeyEvent& keyEvent )\r
 {\r
   bool eventHandled( false );\r
   return eventHandled;\r
 }\r
 \r
-bool InputMethodContextWin::ProcessEventKeyUp( const KeyEvent& keyEvent )\r
+bool InputMethodContextWin::ProcessEventKeyUp( const Dali::KeyEvent& keyEvent )\r
 {\r
   bool eventHandled( false );\r
   return eventHandled;\r