Merge "[Windows version] WindowImpl cleanup, fixes and improvements." into devel...

[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 e19e98e..21c19fa 100755 (executable)
--- a/dali/internal/window-system/windows/platform-implement-win.h
+++ b/dali/internal/window-system/windows/platform-implement-win.h
@@ -34,7 +34,7 @@ namespace Internal
 namespace Adaptor\r
 {\r
 \r
-namespace WindowsPlatformImplementation\r
+namespace WindowsPlatform\r
 {\r
 \r
 bool PostWinThreadMessage(\r
@@ -60,18 +60,17 @@ unsigned int GetCurrentMilliSeconds( void );
 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
@@ -79,6 +78,12 @@ public:
     _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
@@ -86,21 +91,14 @@ public:
     _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