Merge "windows: Store the window handle in a pointer sized type" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / windows / platform-implement-win.h

diff --git a/dali/internal/window-system/windows/platform-implement-win.h b/dali/internal/window-system/windows/platform-implement-win.h
index 4ba8799..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
@@ -37,19 +37,17 @@ namespace Adaptor
 namespace WindowsPlatformImplementation\r
 {\r
 \r
-void RunLoop();\r
-\r
 bool PostWinThreadMessage(\r
     _In_ uint32_t Msg,\r
-    _In_ uint32_t wParam,\r
+    _In_ uint64_t wParam,\r
     _In_ uint64_t lParam,\r
     _In_ uint64_t threadID = -1 );\r
 \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
@@ -66,7 +64,7 @@ public:
 \r
   virtual ~WindowImpl();\r
 \r
-  static void ProcWinMessge( uint64_t hWnd, uint32_t uMsg, uint64_t wParam, uint64_t lParam );\r
+  static void ProcWinMessage( uint64_t hWnd, uint32_t uMsg, uint64_t wParam, uint64_t lParam );\r
 \r
   void GetDPI( float &xDpi, float &yDpi );\r
 \r
@@ -85,19 +83,20 @@ public:
 \r
   bool PostWinMessage(\r
     _In_ uint32_t Msg,\r
-    _In_ uint32_t wParam,\r
+    _In_ uint64_t wParam,\r
     _In_ uint64_t lParam );\r
 \r
   int32_t GetEdgeWidth();\r
 \r
   int32_t GetEdgeHeight();\r
 \r
+  void SetHWND(uint64_t inHWnd);\r
+  void SetWinProc();\r
+\r
 protected:\r
 \r
 private:\r
 \r
-  void SetHWND( uint64_t inHWnd );\r
-\r
   unsigned long windowStyle;\r
 \r
   int colorDepth;\r