Merge "Fix build errors for MS-Windows after KeyEvent class pimpling patch." into...

diff --git a/dali/internal/system/windows/timer-impl-win.cpp b/dali/internal/system/windows/timer-impl-win.cpp
index 7691199..ae9335d 100755 (executable)
--- a/dali/internal/system/windows/timer-impl-win.cpp
+++ b/dali/internal/system/windows/timer-impl-win.cpp
@@ -51,7 +51,7 @@ struct Timer::Impl
   {
   }
 
-  int mId;
+  intptr_t mId;
 
   unsigned int mInterval;
 };

diff --git a/dali/internal/window-system/windows/platform-implement-win.cpp b/dali/internal/window-system/windows/platform-implement-win.cpp
index 65d76b4..9322e26 100755 (executable)
--- a/dali/internal/window-system/windows/platform-implement-win.cpp
+++ b/dali/internal/window-system/windows/platform-implement-win.cpp
@@ -241,20 +241,20 @@ void CALLBACK TimerProc(HWND hWnd, UINT nMsg, UINT_PTR nTimerid, DWORD dwTime)
   info->callback( info->data );
 }
 
-int SetTimer(int interval, timerCallback callback, void *data)
+intptr_t SetTimer(int interval, timerCallback callback, void *data)
 {
   TTimerCallbackInfo *callbackInfo = new TTimerCallbackInfo;
   callbackInfo->data = data;
   callbackInfo->callback = callback;
   callbackInfo->hWnd = ::GetActiveWindow();
 
-  UINT_PTR timerID = (UINT_PTR)callbackInfo;
+  INT_PTR timerID = (INT_PTR)callbackInfo;
   ::SetTimer( callbackInfo->hWnd, timerID, interval, TimerProc );
 
   return timerID;
 }
 
-void KillTimer(int id)
+void KillTimer(intptr_t id)
 {
   TTimerCallbackInfo *info = (TTimerCallbackInfo*)id;
   ::KillTimer( info->hWnd, id );

diff --git a/dali/internal/window-system/windows/platform-implement-win.h b/dali/internal/window-system/windows/platform-implement-win.h
index e84dce7..e19e98e 100755 (executable)
--- a/dali/internal/window-system/windows/platform-implement-win.h
+++ b/dali/internal/window-system/windows/platform-implement-win.h
@@ -22,7 +22,7 @@
 #include <stdint.h>\r
 #include <dali/public-api/signals/callback.h>\r
 \r
-typedef uint64_t   WinWindowHandle;\r
+typedef uintptr_t  WinWindowHandle;\r
 typedef uint64_t   WinPixmap;\r
 \r
 namespace Dali\r
@@ -45,9 +45,9 @@ bool PostWinThreadMessage(
 \r
 using timerCallback = bool(*)(void *data);\r
 \r
-int SetTimer(int interval, timerCallback callback, void *data);\r
+intptr_t SetTimer(int interval, timerCallback callback, void *data);\r
 \r
-void KillTimer(int id);\r
+void KillTimer(intptr_t id);\r
 \r
 const char* GetKeyName( int keyCode );\r
 \r

diff --git a/dali/internal/window-system/windows/window-base-win.cpp b/dali/internal/window-system/windows/window-base-win.cpp
index 86994da..6a61154 100755 (executable)
--- a/dali/internal/window-system/windows/window-base-win.cpp
+++ b/dali/internal/window-system/windows/window-base-win.cpp
@@ -67,7 +67,7 @@ WindowBaseWin::~WindowBaseWin()
 void WindowBaseWin::Initialize( PositionSize positionSize, Any surface, bool isTransparent )
 {
   // see if there is a surface in Any surface
-  unsigned int surfaceId = GetSurfaceId( surface );
+  uintptr_t surfaceId = GetSurfaceId( surface );
 
   // if the surface is empty, create a new one.
   if( surfaceId == 0 )
@@ -462,9 +462,9 @@ void WindowBaseWin::SetTransparency( bool transparent )
 {
 }
 
-unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
+uintptr_t WindowBaseWin::GetSurfaceId( Any surface ) const
 {
-  unsigned int surfaceId = 0;
+  uintptr_t surfaceId = 0;
 
   if ( surface.Empty() == false )
   {
@@ -486,13 +486,13 @@ void WindowBaseWin::CreateWinWindow( PositionSize positionSize, bool isTranspare
   DALI_ASSERT_ALWAYS( mWin32Window != 0 && "There is no Windows window" );
 }
 
-void WindowBaseWin::SetWinWindow( unsigned int surfaceId )
+void WindowBaseWin::SetWinWindow( uintptr_t surfaceId )
 {
   HWND hWnd = (HWND)surfaceId;
 
   mWin32Window = static_cast<WinWindowHandle>(surfaceId);
 
-  mWindowImpl.SetHWND( reinterpret_cast<uint64_t>(hWnd));
+  mWindowImpl.SetHWND(surfaceId);
 
   mWindowImpl.SetWinProc();
 }

diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h
index 48c0560..aa5ab49 100755 (executable)
--- a/dali/internal/window-system/windows/window-base-win.h
+++ b/dali/internal/window-system/windows/window-base-win.h
@@ -363,7 +363,7 @@ private:
    * @param surface Any containing a surface id, or can be empty
    * @return surface id, or zero if surface is empty
    */
-  unsigned int GetSurfaceId( Any surface ) const;
+  uintptr_t GetSurfaceId( Any surface ) const;
 
   /**
    * @brief Create window
@@ -373,7 +373,7 @@ private:
   /**
    * @brief Sets up an already created window.
    */
-  void SetWinWindow( unsigned int surfaceId );
+  void SetWinWindow( uintptr_t surfaceId );
 
 private: