Merge "Renamed KeyEvent enum values to comply with coding standards." into devel...

diff --combined dali/internal/window-system/windows/window-base-win.cpp
index c2924d0,c78de35..706c262
--- 1/dali/internal/window-system/windows/window-base-win.cpp
--- 2/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@@ -127,7 -127,7 +127,7 @@@ void WindowBaseWin::OnMouseButtonDown( 
      Integration::Point point;
      point.SetDeviceId( touchEvent.multi.device );
      point.SetState( state );
 -    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + mWindowImpl.GetEdgeHeight() ) );
 +    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + WindowsPlatform::WindowImpl::EDGE_HEIGHT ) );
      point.SetRadius( touchEvent.multi.radius, Vector2( touchEvent.multi.radius_x, touchEvent.multi.radius_y ) );
      point.SetPressure( touchEvent.multi.pressure );
      point.SetAngle( Degree( touchEvent.multi.angle ) );
@@@ -151,7 -151,7 +151,7 @@@ void WindowBaseWin::OnMouseButtonUp( in
      Integration::Point point;
      point.SetDeviceId( touchEvent.multi.device );
      point.SetState( state );
 -    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + mWindowImpl.GetEdgeHeight() ) );
 +    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + WindowsPlatform::WindowImpl::EDGE_HEIGHT ) );
      point.SetRadius( touchEvent.multi.radius, Vector2( touchEvent.multi.radius_x, touchEvent.multi.radius_y ) );
      point.SetPressure( touchEvent.multi.pressure );
      point.SetAngle( Degree( touchEvent.multi.angle ) );
@@@ -175,7 -175,7 +175,7 @@@ void WindowBaseWin::OnMouseButtonMove( 
      Integration::Point point;
      point.SetDeviceId( touchEvent.multi.device );
      point.SetState( state );
 -    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + mWindowImpl.GetEdgeHeight() ) );
 +    point.SetScreenPosition( Vector2( touchEvent.x, touchEvent.y + WindowsPlatform::WindowImpl::EDGE_HEIGHT) );
      point.SetRadius( touchEvent.multi.radius, Vector2( touchEvent.multi.radius_x, touchEvent.multi.radius_y ) );
      point.SetPressure( touchEvent.multi.pressure );
      point.SetAngle( Degree( touchEvent.multi.angle ) );
@@@ -205,7 -205,7 +205,7 @@@ void WindowBaseWin::OnKeyDown( int type
      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseWin::OnKeyDown\n" );
  
      int keyCode = event->wParam;
 -    std::string keyName( WindowsPlatformImplementation::GetKeyName( keyCode ) );
 +    std::string keyName( WindowsPlatform::GetKeyName( keyCode ) );
      std::string keyString;
      std::string emptyString;
  
@@@ -215,7 -215,7 +215,7 @@@
      // Ensure key event string is not NULL as keys like SHIFT have a null string.
      keyString.push_back( event->wParam );
  
-     Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+     Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
  
      mKeyEventSignal.Emit( keyEvent );
    }
@@@ -228,7 -228,7 +228,7 @@@ void WindowBaseWin::OnKeyUp( int type, 
      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseWin::OnKeyDown\n" );
  
      int keyCode = event->wParam;
 -    std::string keyName( WindowsPlatformImplementation::GetKeyName( keyCode ) );
 +    std::string keyName( WindowsPlatform::GetKeyName( keyCode ) );
      std::string keyString;
      std::string emptyString;
  
@@@ -238,7 -238,7 +238,7 @@@
      // Ensure key event string is not NULL as keys like SHIFT have a null string.
      keyString.push_back( event->wParam );
  
-     Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+     Integration::KeyEvent keyEvent( keyName, emptyString, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, emptyString, emptyString, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
  
      mKeyEventSignal.Emit( keyEvent );
    }
@@@ -479,8 -479,7 +479,8 @@@ uintptr_t WindowBaseWin::GetSurfaceId( 
  
  void WindowBaseWin::CreateWinWindow( PositionSize positionSize, bool isTransparent )
  {
 -  long hWnd = mWindowImpl.CreateHwnd( "Demo", "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );
 +  long hWnd = WindowsPlatform::WindowImpl::CreateHwnd( "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );
 +  mWindowImpl.SetHWND(hWnd);
  
    mWin32Window = static_cast<WinWindowHandle>(hWnd);