mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve stability of event

Browse Source
This commit is contained in:
Jinhao
2016-04-10 15:23:44 +08:00
parent 88b9149f54
commit 07b5b19545
23 changed files with 118 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/gui/detail/events_operation.cpp
View File

@@ -1,4 +1,5 @@
#include <nana/gui/detail/events_operation.hpp>
#include <nana/gui/detail/bedrock.hpp>
namespace nana
{
@@ -7,18 +8,6 @@ namespace nana
//class events_operation
using lock_guard = std::lock_guard<std::recursive_mutex>;
void events_operation::make(window wd, const std::shared_ptr<general_events>& sp)
{
lock_guard lock(mutex_);
evt_table_[wd] = sp;
}
void events_operation::umake(window wd)
{
lock_guard lock(mutex_);
evt_table_.erase(wd);
}
void events_operation::register_evt(event_handle evt)
{
lock_guard lock(mutex_);
@@ -72,9 +61,11 @@ namespace nana
internal_scope_guard lock;
if (dockers_)
{
auto & evt_operation = bedrock::instance().evt_operation();
for (auto p : *dockers_)
{
detail::events_operation_cancel(reinterpret_cast<event_handle>(p));
evt_operation.cancel(reinterpret_cast<event_handle>(p));
delete p;
}
dockers_->clear();