X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fwindow-system%2Fwindows%2Fwindow-base-win.cpp;h=7efa8b3639583fdb095a1092dcdfacab905f7832;hb=70189749d12fc175c530b8d852386e1c13088fbd;hp=b1d6f1c268e998ff72cfa4427b3932e7fa090909;hpb=4a0a44830468ad7ee43938f7118d71728a5a9376;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp
index b1d6f1c..7efa8b3 100755
--- a/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@ -100,25 +100,25 @@ void WindowBaseWin::OnFocusOut( int type, TWinEventInfo *event )
 
 void WindowBaseWin::OnWindowDamaged( int type, TWinEventInfo *event )
 {
-  Event_Mouse_Button* windowDamagedEvent( (Event_Mouse_Button*)event );
-
-  if( windowDamagedEvent->window == mWin32Window )
-  {
-    DamageArea area;
-    area.x = 0;
-    area.y = 0;
-    WindowSystem::GetScreenSize( area.width, area.height );
-
-    mWindowDamagedSignal.Emit( area );
-  }
+  Event_Mouse_Button* windowDamagedEvent( (Event_Mouse_Button*)event );
+
+  if( windowDamagedEvent->window == mWin32Window )
+  {
+    DamageArea area;
+    area.x = 0;
+    area.y = 0;
+    WindowSystem::GetScreenSize( area.width, area.height );
+
+    mWindowDamagedSignal.Emit( area );
+  }
 }
 
 void WindowBaseWin::OnMouseButtonDown( int type, TWinEventInfo *event )
 {
   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 );
+  touchEvent.y = HIWORD( event->lParam );
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -141,8 +141,8 @@ void WindowBaseWin::OnMouseButtonUp( int type, TWinEventInfo *event )
 {
   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 );
+  touchEvent.y = HIWORD( event->lParam );
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -165,8 +165,8 @@ void WindowBaseWin::OnMouseButtonMove( int type, TWinEventInfo *event )
 {
   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 );
+  touchEvent.y = HIWORD( event->lParam );
   touchEvent.multi.device = DEVICE_MOUSE;
 
   if( touchEvent.window == mWin32Window )
@@ -454,6 +454,10 @@ void WindowBaseWin::SetWindowRotationAngle( int degree )
 {
 }
 
+int WindowBaseWin::GetWindowRotationAngle()
+{
+}
+
 void WindowBaseWin::WindowRotationCompleted( int degree, int width, int height )
 {
 }
@@ -462,6 +466,10 @@ void WindowBaseWin::SetTransparency( bool transparent )
 {
 }
 
+int WindowBaseWin::GetOrientation() const
+{
+}
+
 unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
 {
   unsigned int surfaceId = 0;
@@ -479,11 +487,11 @@ unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
 
 void WindowBaseWin::CreateWinWindow( PositionSize positionSize, bool isTransparent )
 {
-  long hWnd = WindowsPlatformImplementation::CreateHwnd( "Demo", "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );
-
-  WindowsPlatformImplementation::ShowWindow( hWnd );
-
-  mWin32Window = (WinWindowHandle)hWnd;
+  long hWnd = WindowsPlatformImplementation::CreateHwnd( "Demo", "Demo", positionSize.x, positionSize.y, positionSize.width, positionSize.height, NULL );
+
+  WindowsPlatformImplementation::ShowWindow( hWnd );
+
+  mWin32Window = (WinWindowHandle)hWnd;
   DALI_ASSERT_ALWAYS( mWin32Window != 0 && "There is no Windows window" );
 }
 
@@ -491,67 +499,77 @@ void WindowBaseWin::EventEntry( TWinEventInfo *event )
 {
   unsigned int uMsg = event->uMsg;
 
-  switch( uMsg )
-  {
-  case WM_SETFOCUS:
-  {
-    OnFocusIn( uMsg, event );
-    break;
-  }
-
-  case WM_KILLFOCUS:
-  {
-    OnFocusOut( uMsg, event );
-    break;
-  }
-
-  case WM_PAINT:
-  {
-    OnWindowDamaged( uMsg, event );
-    break;
-  }
-
-  case WM_LBUTTONDOWN:
-  {
-    OnMouseButtonDown( uMsg, event );
-    break;
-  }
-
-  case WM_LBUTTONUP:
-  {
-    OnMouseButtonUp( uMsg, event );
-    break;
-  }
-
-  case WM_MOUSEMOVE:
-  {
-    OnMouseButtonMove( uMsg, event );
-    break;
-  }
-
-  case WM_MOUSEWHEEL:
-  {
-    OnMouseWheel( uMsg, event );
-    break;
-  }
-
-  case WM_KEYDOWN:
-  {
-    OnKeyDown( uMsg, event );
-    break;
-  }
-
-  case WM_KEYUP:
-  {
-    OnKeyUp( uMsg, event );
-    break;
-  }
-
+  switch( uMsg )
+  {
+  case WM_SETFOCUS:
+  {
+    OnFocusIn( uMsg, event );
+    break;
+  }
+
+  case WM_KILLFOCUS:
+  {
+    OnFocusOut( uMsg, event );
+    break;
+  }
+
+  case WM_PAINT:
+  {
+    OnWindowDamaged( uMsg, event );
+    break;
+  }
+
+  case WM_LBUTTONDOWN:
+  {
+    OnMouseButtonDown( uMsg, event );
+    break;
+  }
+
+  case WM_LBUTTONUP:
+  {
+    OnMouseButtonUp( uMsg, event );
+    break;
+  }
+
+  case WM_MOUSEMOVE:
+  {
+    OnMouseButtonMove( uMsg, event );
+    break;
+  }
+
+  case WM_MOUSEWHEEL:
+  {
+    OnMouseWheel( uMsg, event );
+    break;
+  }
+
+  case WM_KEYDOWN:
+  {
+    OnKeyDown( uMsg, event );
+    break;
+  }
+
+  case WM_KEYUP:
+  {
+    OnKeyUp( uMsg, event );
+    break;
+  }
+
   default:
-    break;
+    break;
   }
 }
 
+void WindowBaseWin::SetParent( Any parent )
+{
+
+}
+
+bool WindowBaseWin::IsMatchedWindow( Any window )
+{
+  return false;
+}
+
 } // namespace Adaptor
 
 } // namespace Internal