Merge "[AT-SPI] Add API for blocking automatic Bridge initialization" into devel...

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / windows / callback-manager-win.cpp

diff --git a/dali/internal/system/windows/callback-manager-win.cpp b/dali/internal/system/windows/callback-manager-win.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 27f9465..19bf14d
--- a/dali/internal/system/windows/callback-manager-win.cpp
+++ b/dali/internal/system/windows/callback-manager-win.cpp
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -19,55 +19,57 @@
 #include <dali/internal/system/windows/callback-manager-win.h>\r
 \r
 // EXTERNAL INCLUDES\r
-#include <dali/integration-api/debug.h>\r
 #include <Windows.h>\r
 \r
+// Need to undef the following constants as they are defined in one of the headers in Windows.h but used in DALi (via debug.h)\r
+#undef TRANSPARENT // Used in constants.h\r
+#undef CopyMemory // Used in dali-vector.h\r
+\r
+#include <dali/integration-api/debug.h>\r
+\r
 // INTERNAL INCLUDES\r
 #include <dali/internal/window-system/windows/platform-implement-win.h>\r
 \r
 namespace Dali\r
 {\r
-\r
 namespace Internal\r
 {\r
-\r
 namespace Adaptor\r
 {\r
-\r
 WinCallbackManager::WinCallbackManager()\r
-:mRunning(false)\r
+: mRunning(false)\r
 {\r
 }\r
 \r
 void WinCallbackManager::Start()\r
 {\r
-  DALI_ASSERT_DEBUG( mRunning == false );\r
+  DALI_ASSERT_DEBUG(mRunning == false);\r
   mRunning = true;\r
 }\r
 \r
 void WinCallbackManager::Stop()\r
 {\r
   // make sure we're not called twice\r
-  DALI_ASSERT_DEBUG( mRunning == true );\r
+  DALI_ASSERT_DEBUG(mRunning == true);\r
 \r
   mRunning = false;\r
 }\r
 \r
-bool WinCallbackManager::AddIdleCallback( CallbackBase* callback, bool hasReturnValue )\r
+bool WinCallbackManager::AddIdleCallback(CallbackBase* callback, bool hasReturnValue)\r
 {\r
-  if( !mRunning )\r
+  if(!mRunning)\r
   {\r
     return false;\r
   }\r
 \r
   mCallbacks.insert(callback);\r
 \r
-  WindowsPlatform::PostWinThreadMessage( WIN_CALLBACK_EVENT, reinterpret_cast<uint64_t>(callback), 0 );\r
+  WindowsPlatform::PostWinThreadMessage(WIN_CALLBACK_EVENT, reinterpret_cast<uint64_t>(callback), 0);\r
 \r
   return true;\r
 }\r
 \r
-void WinCallbackManager::RemoveIdleCallback( CallbackBase* callback )\r
+void WinCallbackManager::RemoveIdleCallback(CallbackBase* callback)\r
 {\r
   //Wait for deal\r
 }\r
@@ -76,7 +78,7 @@ bool WinCallbackManager::ProcessIdle()
 {\r
   const bool idleProcessed = !mCallbacks.empty();\r
 \r
-  for (CallbackBase* cb : mCallbacks)\r
+  for(CallbackBase* cb : mCallbacks)\r
   {\r
     Dali::CallbackBase::Execute(*cb);\r
   }\r
@@ -90,14 +92,13 @@ void WinCallbackManager::ClearIdleCallbacks()
   mCallbacks.clear();\r
 }\r
 \r
-bool WinCallbackManager::AddIdleEntererCallback( CallbackBase* callback )\r
+bool WinCallbackManager::AddIdleEntererCallback(CallbackBase* callback)\r
 {\r
-  return AddIdleCallback( callback, true );\r
+  return AddIdleCallback(callback, true);\r
 }\r
 \r
-void WinCallbackManager::RemoveIdleEntererCallback( CallbackBase* callback )\r
+void WinCallbackManager::RemoveIdleEntererCallback(CallbackBase* callback)\r
 {\r
-\r
 }\r
 \r
 // Creates a concrete interface for CallbackManager\r