\r
// EXTERNAL_HEADERS\r
#include <stdint.h>\r
+#include <string>\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
namespace Adaptor\r
{\r
\r
-namespace WindowsPlatformImplementation\r
+namespace WindowsPlatform\r
{\r
\r
bool PostWinThreadMessage(\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
+std::string GetKeyName( int keyCode );\r
\r
uint64_t GetCurrentThreadId();\r
\r
class WindowImpl\r
{\r
public:\r
+ static const uint32_t STYLE;\r
+ static const int32_t EDGE_WIDTH;\r
+ static const int32_t EDGE_HEIGHT;\r
+\r
WindowImpl();\r
\r
virtual ~WindowImpl();\r
\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
- int GetColorDepth();\r
-\r
- uint64_t CreateHwnd(\r
- _In_opt_ const char *lpClassName,\r
+ static uint64_t CreateHwnd(\r
_In_opt_ const char *lpWindowName,\r
_In_ int X,\r
_In_ int Y,\r
_In_ int nHeight,\r
_In_opt_ uint64_t parent );\r
\r
+ static void DestroyHWnd(uint64_t hWnd);\r
+\r
+ void GetDPI( float &xDpi, float &yDpi );\r
+\r
+ int GetColorDepth();\r
+\r
void SetListener( CallbackBase *callback );\r
\r
bool PostWinMessage(\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
- unsigned long windowStyle;\r
-\r
int colorDepth;\r
- uint64_t mHWnd;\r
+ uint64_t mHWnd; // no ownership, managed outside\r
uint64_t mHdc;\r
\r
CallbackBase *listener;\r