Revert "[Tizen] Fix to get the logical key to ecore key variable"

This reverts commit dd1490e677293bcb4a81aa6d6162f5a93fa35adb.

diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
index 1405ba8..b043d32 100755 (executable)
--- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
@@ -946,16 +946,13 @@ bool InputMethodContextEcoreWl::ProcessEventKeyDown( const KeyEvent& keyEvent )
   bool eventHandled( false );
   if ( mIMFContext )
   {
-    Integration::KeyEvent integKeyEvent( keyEvent );
-    std::string key = integKeyEvent.key;
-
     std::string compose = keyEvent.GetCompose();
     std::string deviceName = keyEvent.GetDeviceName();
 
     // We're consuming key down event so we have to pass to InputMethodContext so that it can parse it as well.
     Ecore_IMF_Event_Key_Down ecoreKeyDownEvent;
     ecoreKeyDownEvent.keyname = keyEvent.keyPressedName.c_str();
-    ecoreKeyDownEvent.key = key.c_str();
+    ecoreKeyDownEvent.key = keyEvent.keyPressedName.c_str();
     ecoreKeyDownEvent.string = keyEvent.keyPressed.c_str();
     ecoreKeyDownEvent.compose = compose.c_str();
     ecoreKeyDownEvent.timestamp = keyEvent.time;
@@ -999,16 +996,13 @@ bool InputMethodContextEcoreWl::ProcessEventKeyUp( const KeyEvent& keyEvent )
   bool eventHandled( false );
   if( mIMFContext )
   {
-    Integration::KeyEvent integKeyEvent( keyEvent );
-    std::string key = integKeyEvent.key;
-
     std::string compose = keyEvent.GetCompose();
     std::string deviceName = keyEvent.GetDeviceName();
 
     // We're consuming key up event so we have to pass to InputMethodContext so that it can parse it as well.
     Ecore_IMF_Event_Key_Up ecoreKeyUpEvent;
     ecoreKeyUpEvent.keyname = keyEvent.keyPressedName.c_str();
-    ecoreKeyUpEvent.key = key.c_str();
+    ecoreKeyUpEvent.key = keyEvent.keyPressedName.c_str();
     ecoreKeyUpEvent.string = keyEvent.keyPressed.c_str();
     ecoreKeyUpEvent.compose = compose.c_str();
     ecoreKeyUpEvent.timestamp = keyEvent.time;

diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
index ccb9de5..7a28eb3 100755 (executable)
--- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
@@ -753,15 +753,12 @@ bool InputMethodContextX::ProcessEventKeyDown( const KeyEvent& keyEvent )
   bool eventHandled( false );
   if ( mIMFContext )
   {
-    Integration::KeyEvent integKeyEvent( keyEvent );
-    std::string key = integKeyEvent.key;
-
     std::string compose = keyEvent.GetCompose();
 
     // We're consuming key down event so we have to pass to InputMethodContext so that it can parse it as well.
     Ecore_IMF_Event_Key_Down ecoreKeyDownEvent;
     ecoreKeyDownEvent.keyname = keyEvent.keyPressedName.c_str();
-    ecoreKeyDownEvent.key = key.c_str();
+    ecoreKeyDownEvent.key = keyEvent.keyPressedName.c_str();
     ecoreKeyDownEvent.string = keyEvent.keyPressed.c_str();
     ecoreKeyDownEvent.compose = compose.c_str();
     ecoreKeyDownEvent.timestamp = keyEvent.time;
@@ -807,15 +804,12 @@ bool InputMethodContextX::ProcessEventKeyUp( const KeyEvent& keyEvent )
   bool eventHandled( false );
   if( mIMFContext )
   {
-    Integration::KeyEvent integKeyEvent( keyEvent );
-    std::string key = integKeyEvent.key;
-
     std::string compose = keyEvent.GetCompose();
 
     // We're consuming key up event so we have to pass to InputMethodContext so that it can parse it as well.
     Ecore_IMF_Event_Key_Up ecoreKeyUpEvent;
     ecoreKeyUpEvent.keyname = keyEvent.keyPressedName.c_str();
-    ecoreKeyUpEvent.key = key.c_str();
+    ecoreKeyUpEvent.key = keyEvent.keyPressedName.c_str();
     ecoreKeyUpEvent.string = keyEvent.keyPressed.c_str();
     ecoreKeyUpEvent.compose = compose.c_str();
     ecoreKeyUpEvent.timestamp = keyEvent.time;

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 a99763d..7c09270 100755 (executable)
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -734,11 +734,9 @@ bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )
 //  if ( mIMFContext )\r
 //  {\r
 //    // We're consuming key down event so we have to pass to InputMethodContext so that it can parse it as well.\r
-//    Internal::KeyEventImpl& keyEventImpl = GetImplementation( keyEvent );\r
-//    std::string key = keyEventImpl.GetKey();\r
 //    Ecore_IMF_Event_Key_Down ecoreKeyDownEvent;\r
 //    ecoreKeyDownEvent.keyname = keyEvent.keyPressedName.c_str();\r
-//    ecoreKeyDownEvent.key = key.c_str();\r
+//    ecoreKeyDownEvent.key = keyEvent.keyPressedName.c_str();\r
 //    ecoreKeyDownEvent.string = keyEvent.keyPressed.c_str();\r
 //    ecoreKeyDownEvent.compose = keyEvent.GetCompose().c_str();\r
 //    ecoreKeyDownEvent.timestamp = keyEvent.time;\r
@@ -785,11 +783,9 @@ bool InputMethodContextWin::ProcessEventKeyUp( const KeyEvent& keyEvent )
 //  if( mIMFContext )\r
 //  {\r
 //    // We're consuming key up event so we have to pass to InputMethodContext so that it can parse it as well.\r
-//    Internal::KeyEventImpl& keyEventImpl = GetImplementation( keyEvent );\r
-//    std::string key = keyEventImpl.GetKey();\r
 //    Ecore_IMF_Event_Key_Up ecoreKeyUpEvent;\r
 //    ecoreKeyUpEvent.keyname = keyEvent.keyPressedName.c_str();\r
-//    ecoreKeyUpEvent.key = key.c_str();\r
+//    ecoreKeyUpEvent.key = keyEvent.keyPressedName.c_str();\r
 //    ecoreKeyUpEvent.string = keyEvent.keyPressed.c_str();\r
 //    ecoreKeyUpEvent.compose = keyEvent.GetCompose().c_str();\r
 //    ecoreKeyUpEvent.timestamp = keyEvent.time;\r

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
index 571a3a6..6af5474 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
@@ -998,7 +998,6 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -1008,12 +1007,6 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event )
       compose = keyEvent->compose;
     }
 
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
     keyCode = ( keyCode == -1 ) ? 0 : keyCode;
     int modifier( keyEvent->modifiers );
@@ -1037,7 +1030,7 @@ void WindowBaseEcoreWl::OnKeyDown( void* data, int type, void* event )
     GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
     GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
 
      mKeyEventSignal.Emit( keyEvent );
   }
@@ -1052,7 +1045,6 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -1062,12 +1054,6 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event )
       compose = keyEvent->compose;
     }
 
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
     keyCode = ( keyCode == -1 ) ? 0 : keyCode;
     int modifier( keyEvent->modifiers );
@@ -1091,7 +1077,7 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event )
     GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
     GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
 
      mKeyEventSignal.Emit( keyEvent );
   }

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index bfd4b63..c1b4534 100755 (executable)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -1005,7 +1005,6 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -1015,12 +1014,6 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event )
       compose = keyEvent->compose;
     }
 
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
     keyCode = ( keyCode == -1 ) ? 0 : keyCode;
     int modifier( keyEvent->modifiers );
@@ -1044,7 +1037,7 @@ void WindowBaseEcoreWl2::OnKeyDown( void* data, int type, void* event )
     GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
     GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
 
      mKeyEventSignal.Emit( keyEvent );
   }
@@ -1059,7 +1052,6 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -1069,12 +1061,6 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event )
       compose = keyEvent->compose;
     }
 
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
     keyCode = ( keyCode == -1 ) ? 0 : keyCode;
     int modifier( keyEvent->modifiers );
@@ -1098,7 +1084,7 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event )
     GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
     GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
 
      mKeyEventSignal.Emit( keyEvent );
   }

diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
index edc82c8..639a334 100755 (executable)
--- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
@@ -519,7 +519,6 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreX::OnKeyDown\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -529,12 +528,6 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event )
       compose = keyEvent->compose;
     }
 
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname );
     int modifier( keyEvent->modifiers );
     unsigned long time = keyEvent->timestamp;
@@ -545,7 +538,7 @@ void WindowBaseEcoreX::OnKeyDown( void* data, int type, void* event )
       keyString = keyEvent->string;
     }
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
 
     mKeyEventSignal.Emit( keyEvent );
   }
@@ -560,7 +553,6 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event )
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, " WindowBaseEcoreX::OnKeyUp\n" );
 
     std::string keyName( keyEvent->keyname );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -569,12 +561,6 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event )
     {
       compose = keyEvent->compose;
     }
-    // Ensure key symbol is not NULL as keys like SHIFT have a null string.
-    if( keyEvent->key )
-    {
-      key = keyEvent->key;
-    }
-
     int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname );
     int modifier( keyEvent->modifiers );
     unsigned long time( keyEvent->timestamp );
@@ -585,7 +571,7 @@ void WindowBaseEcoreX::OnKeyUp( void* data, int type, void* event )
       keyString = keyEvent->string;
     }
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
 
     mKeyEventSignal.Emit( keyEvent );
   }

diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp
index ceca985..98926f1 100755 (executable)
--- a/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@ -242,17 +242,17 @@ WindowBaseWin::~WindowBaseWin()
   WindowsPlatformImplement::PostWinMessage( WM_CLOSE, 0, 0, mWin32Window );
 }
 
-static void EventEntry( long hWnd, unsigned int uMsg, long wParam, long lParam )
-{
-  EventCallback callback = GetCallback( uMsg );
-  EventHandler *handler = (EventHandler*)GetEventHandler( uMsg );
-
-  if( NULL != callback )
-  {
-    //EventHandler *handler = new EventHandler();
-    TWinEventInfo eventInfo( hWnd, uMsg, wParam, lParam );
-    callback( handler, uMsg, &eventInfo );
-  }
+static void EventEntry( long hWnd, unsigned int uMsg, long wParam, long lParam )\r
+{\r
+  EventCallback callback = GetCallback( uMsg );\r
+  EventHandler *handler = (EventHandler*)GetEventHandler( uMsg );\r
+\r
+  if( NULL != callback )\r
+  {\r
+    //EventHandler *handler = new EventHandler();\r
+    TWinEventInfo eventInfo( hWnd, uMsg, wParam, lParam );\r
+    callback( handler, uMsg, &eventInfo );\r
+  }\r
 }
 
 void WindowBaseWin::Initialize( PositionSize positionSize, Any surface, bool isTransparent )
@@ -379,27 +379,27 @@ void WindowBaseWin::OnFocusOut( void* data, int type, TWinEventInfo *event )
 
 void WindowBaseWin::OnWindowDamaged( void* data, int type, TWinEventInfo *event )
 {
-  Event_Mouse_Button* windowDamagedEvent( (Event_Mouse_Button*)event );
-  EventHandler* handler( (EventHandler*)data );
-
-  if( windowDamagedEvent->window == mWin32Window )
-  {
-    DamageArea area;
-    area.x = 0;
-    area.y = 0;
-    area.width = 480;
-    area.height = 800;
-
-    //handler->SendEvent( area );
-    mWindowDamagedSignal.Emit( area );
-  }
+  Event_Mouse_Button* windowDamagedEvent( (Event_Mouse_Button*)event );\r
+  EventHandler* handler( (EventHandler*)data );\r
+\r
+  if( windowDamagedEvent->window == mWin32Window )\r
+  {\r
+    DamageArea area;\r
+    area.x = 0;\r
+    area.y = 0;\r
+    area.width = 480;\r
+    area.height = 800;\r
+\r
+    //handler->SendEvent( area );\r
+    mWindowDamagedSignal.Emit( area );\r
+  }\r
 }
 
 void WindowBaseWin::OnMouseButtonDown( void* data, int type, TWinEventInfo *event )
 {
   Event_Mouse_Button touchEvent = *((Event_Mouse_Button*)event);
-  touchEvent.x = LOWORD( event->lParam );
-  touchEvent.y = HIWORD( event->lParam );
+  touchEvent.x = LOWORD( event->lParam );\r
+  touchEvent.y = HIWORD( event->lParam );\r
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -429,8 +429,8 @@ void WindowBaseWin::OnMouseButtonDown( void* data, int type, TWinEventInfo *even
 void WindowBaseWin::OnMouseButtonUp( void* data, int type, TWinEventInfo *event )
 {
   Event_Mouse_Button touchEvent = *( (Event_Mouse_Button*)event );
-  touchEvent.x = LOWORD( event->lParam );
-  touchEvent.y = HIWORD( event->lParam );
+  touchEvent.x = LOWORD( event->lParam );\r
+  touchEvent.y = HIWORD( event->lParam );\r
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -461,8 +461,8 @@ void WindowBaseWin::OnMouseButtonMove( void* data, int type, TWinEventInfo *even
 {
   Event_Mouse_Button touchEvent = *((Event_Mouse_Button*)event);
   touchEvent.timestamp = GetTickCount();
-  touchEvent.x = LOWORD( event->lParam );
-  touchEvent.y = HIWORD( event->lParam );
+  touchEvent.x = LOWORD( event->lParam );\r
+  touchEvent.y = HIWORD( event->lParam );\r
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -511,7 +511,6 @@ void WindowBaseWin::OnKeyDown( void* data, int type, TWinEventInfo *event )
 
     int keyCode = event->wParam;
     std::string keyName( WindowsPlatformImplement::GetKeyName( keyCode ) );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -521,7 +520,7 @@ void WindowBaseWin::OnKeyDown( void* data, int type, TWinEventInfo *event )
     // Ensure key event string is not NULL as keys like SHIFT have a null string.
     keyString.push_back( event->wParam );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
 
     mKeyEventSignal.Emit( keyEvent );
   }
@@ -535,7 +534,6 @@ void WindowBaseWin::OnKeyUp( void* data, int type, TWinEventInfo *event )
 
     int keyCode = event->wParam;
     std::string keyName( WindowsPlatformImplement::GetKeyName( keyCode ) );
-    std::string key( "" );
     std::string keyString( "" );
     std::string compose( "" );
 
@@ -545,7 +543,7 @@ void WindowBaseWin::OnKeyUp( void* data, int type, TWinEventInfo *event )
     // Ensure key event string is not NULL as keys like SHIFT have a null string.
     keyString.push_back( event->wParam );
 
-    Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+    Integration::KeyEvent keyEvent( keyName, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
 
     mKeyEventSignal.Emit( keyEvent );
   }
@@ -889,11 +887,11 @@ unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
 
 void WindowBaseWin::CreateWinWindow( PositionSize positionSize, bool isTransparent )
 {
-  long hWnd = WindowsPlatformImplement::CreateHwnd( "Demo", "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );
-
-  WindowsPlatformImplement::ShowWindow( hWnd );
-
-  mWin32Window = (Win_Window_Handle)hWnd;
+  long hWnd = WindowsPlatformImplement::CreateHwnd( "Demo", "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );\r
+\r
+  WindowsPlatformImplement::ShowWindow( hWnd );\r
+\r
+  mWin32Window = (Win_Window_Handle)hWnd;\r
   DALI_ASSERT_ALWAYS( mWin32Window != 0 && "There is no EcoreWin window" );
 }