[Windows version] WindowImpl cleanup, fixes and improvements.

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / windows / trigger-event.cpp

diff --git a/dali/internal/system/windows/trigger-event.cpp b/dali/internal/system/windows/trigger-event.cpp
index cbd5b33..66221cb 100755 (executable)
--- a/dali/internal/system/windows/trigger-event.cpp
+++ b/dali/internal/system/windows/trigger-event.cpp
@@ -42,17 +42,20 @@ TriggerEvent::TriggerEvent( CallbackBase* callback, TriggerEventInterface::Optio
   mOptions( options )\r
 {\r
   // Create accompanying file descriptor.\r
-  mThreadID = WindowsPlatformImplementation::GetCurrentThreadId();\r
+  mThreadID = WindowsPlatform::GetCurrentThreadId();\r
 \r
   if ( mThreadID < 0)\r
   {\r
     DALI_LOG_ERROR("Unable to create TriggerEvent File descriptor\n");\r
   }\r
+\r
+  mSelfCallback = MakeCallback( this, &TriggerEvent::Triggered );\r
 }\r
 \r
 TriggerEvent::~TriggerEvent()\r
 {\r
   delete mCallback;\r
+  delete mSelfCallback;\r
 \r
   if ( mThreadID >= 0)\r
   {\r
@@ -67,8 +70,7 @@ void TriggerEvent::Trigger()
     // Increment event counter by 1.\r
     // Writing to the file descriptor triggers the Dispatch() method in the other thread\r
     // (if in multi-threaded environment).\r
-    CallbackBase *callback = MakeCallback( this, &TriggerEvent::Triggered );\r
-    WindowsPlatformImplementation::PostWinThreadMessage( WIN_CALLBACK_EVENT, reinterpret_cast<uint64_t>( callback ), 0, mThreadID );\r
+    WindowsPlatform::PostWinThreadMessage( WIN_CALLBACK_EVENT, reinterpret_cast<uint64_t>( mSelfCallback ), 0, mThreadID );\r
   }\r
   else\r
   {\r